unit Manager WIP 3

Working against the type system some more.