references refactoring, small figure error fixed, canMove implementation in progress