Some more work on migrating to the new architecture.
Even more work.