Did a lot of work notating moves properly (involved adding support in other classes)