Refactoring to try keeping a single instance of mc engine.  Need to add more diagnostics.