diff --git a/BuildingDirectory/Model/Company.cs b/BuildingDirectory/Model/Company.cs
index 5537d82..a972954 100644
--- a/BuildingDirectory/Model/Company.cs
+++ b/BuildingDirectory/Model/Company.cs
@@ -24,12 +24,11 @@ public sealed class Company
     ///     Gets the name of the company
     /// </summary>
     public string Name { get; }
-    
+
     /// <summary>
     ///     Gets the number of employees working for the company 
     /// </summary>
-    // TODO
-    public int NoOfEmployees => -1;
+    public int NoOfEmployees => _employeeRooms.Count;
 
     /// <summary>
     ///     Returns the room number the clerk identified by the provided
@@ -39,8 +38,8 @@ public sealed class Company
     /// <returns>Room number if found; null otherwise</returns>
     public int? AskForRoom(BusinessCard businessCard)
     {
-        // TODO
-        return -1;
+        bool found = _employeeRooms.TryGetValue(businessCard, out int room);
+        return found ? room : null;
     }
     
 }
\ No newline at end of file