Initial movement in place
merged stuff idk? git is confusing