Mid worksession commit. Still updating UML.