Working on move()
Fixed conflicts