Switch to entity system plus some cleanup of rendering. Will allow objects to update themseles.