Partial work on detailed class diagram