this should round out the clean up and restructure 

Not much to this other then trying to provide a nice clean lattice to work with.