Realized why I hadn't refactored Moves before now...