Added basic movement and fixed some indirect code
Fixed merge conflicts