Adding in movement control