Added move class need to refactor design to pass around the object and pull the data from it