WIP Changing moves to use Type enum