Rewriting the MovementSystem, not done yet