NM Movement

Modified movement algorithm. Pushing this to the end of priority.