Deferred component instantiation, better game state tracking