Reworked Accoutn class, and rotated diagrams