tried to make the MoveList less hardcoded

Haven't tested, we'll see how it goes