squashing all commits here for PR.

fixing reference to sub mgr

updating after 2nd review

Revision 2

final review, added bridge work, and walked through each step

Final Edits