Updated project to use new rank enum format
Also fixes #28 and fixes #29