Start refactoring and commiting the MovementManager