Redid the movement, put it in a class