Working on move class