Class Diagram Changes (Probably Final)

Please take a look.