Partial work on detailed class diagram
Partial work on detailed class diagram - edit
Merge remote-tracking branch 'origin/Melissa'