Part II of the WIP - continuing on the integration of the DM.