Develop

Just tried it really quickly and it seemed to fix the problem of overwriting internal values.
You should run the mabi tests on it though to make sure there still all passing.