More inline fixes
Simulation added
Simulation added to world
System update added (not final)
Logic to allocate map added