Commit before refactoring to include MoveState
About to change Player.move mechanics