Redid the DiC logic, the nested complexity was insane. Dropped it for a new DiC-decorator concept, where modules may decorate the existing DiC.