Some re-architecture to bring this closer into line with the ideal method for extensions.