Working on move class
merge please