Removed some of the movement code (it was a bit breaky)