Got basic movement code working now - just need to refactor.