Doing some prep work for support interface layers.
Some refactoring of code into the classes that should contain it.