updated states to grab objects from game singleton instead of by passing