Movement and Collision

Movement is fully working, Finish conditional, and edge conditions work,
I'm struggling to get the backtracking from untouched to touched
working.