work in progress of collapsing driver mess
collapsed drivers stuff into the unit definitions, movable block stuff now works correctly