Move gameplay stuff back to basics