Need to fix move functions

I'm the map, I'm the map, I'm the maaaaaaap!