Did some stuff
Changed confusing comment
Removed prop_move