There's a lot of work here that sets up dependency injection traits which will make it easier for me to keep writing tests and will make it easier for me to separate the Core from the support infrastructure.
