Checkpoint before changes to support server loading

Next will be packaging work to allow each extension to be loaded from
server - just as it would in real world