we need better wrapper organization/consolidation to allow new and old msi's to easily coexist

The MSI redesign is coming along, though still turned off by default. Due to many changes going into the repo, there are many times where new code will break the MSI redesign. The purpose of this CR is to consolidate some of the wrapper code to get into a position where it's easy for both new and old MSI's to coexist.