Some re-arranging to make MCP work, add some doc and tests (#3) de37bdf unverified Nathan Brake commited on Mar 12