Added past code to Movement class