Updated more of the UML

Might possibly use a ArrayList with jTree..