progress on move lock and remove