Move function now in board class plus other cleanup.