Added movement
Added comments
Merged master