working on move logic
merge