changed movement method back to a switch statement