Reworked class diagram. Not important just what we discussed yesterday.