combined UMLs, started working on a list of what we need to test