Have to redo the Movement class, its a complete mess