Last commit before fully implementing GameObjects