Refactored movement, more OO now