Changed the enums

Also got rid of that class diagram thing...