matched option 9 to diagrams, tidied a lot of code, removed some methods and implemented others.