Refactoring, adding pantheon diagram