refactoring finally complete, move tracker working right