Much more pieced together.  Same issue with handing data sources to other Ctrl classes

But adding to or editing the code should be easier.