Closed #27, movement now behaving properly