Moved the move check into the data structure