Added a lot of functionality to the UML diagram -- should be updated at tomorrow's meeting