initial implementation and fixes
going to move towards a git fix
Minor cleanups.
Merge branch 'omnibussing-balanced'