Still updating javadocs and UML.