update to new MCP mappings/ updated forge build -- UNTESTED