diff -r 5543340db663 -r ead2ed20dfd4 gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Tue May 04 21:30:25 2010 +0000
+++ b/gameServer/CoreTypes.hs	Wed May 05 08:01:37 2010 +0000
@@ -12,6 +12,7 @@
 import Network
 import Data.Function
 
+import RoomsAndClients
 
 data ClientInfo =
     ClientInfo
@@ -177,12 +178,12 @@
     | ClientAccountInfo (Int, AccountInfo)
     | TimerAction Int
 
-type Clients = IntMap.IntMap ClientInfo
-type Rooms = IntMap.IntMap RoomInfo
+type MRnC = MRoomsAndClients RoomInfo ClientInfo
+type IRnC = IRoomsAndClients RoomInfo ClientInfo
 
 --type ClientsTransform = [ClientInfo] -> [ClientInfo]
 --type RoomsTransform = [RoomInfo] -> [RoomInfo]
 --type HandlesSelector = ClientInfo -> [ClientInfo] -> [RoomInfo] -> [ClientInfo]
 --type Answer = ServerInfo -> (HandlesSelector, [String])
 
-type ClientsSelector = Clients -> Rooms -> [Int]
+--type ClientsSelector = Clients -> Rooms -> [Int]