refactor.  Moved all small move calc to single method.