Reworked hierarchy of classes in the first problem and started work on concordance.