Checking in units, mostly working except for DTI bug because I might start playing with refactors now