Merging in AI simulation work into GameServer