More changes to MP2 core, compiles now but is not working at all (WiP)