Refactored the movements to be enabled by states