Refactor - map is now responsible for moving objects
Merge