Made significant changes to movement, next step is to remove from Sprite class and into Entity classes