LAST COMMIT FOR 1.6.4!!! Lots of stuff for 1.7 prep. Won't start coding in 1.7 environment until mcp mappings are done.