Midway through unit relevance stuff

Not completely error free - but I need to merge to be able to continue.