Movement

movement rework