movement is now functional
commented a line out
fixed merge conflicts