Developing

Moving the new bits of code to the developing branch. Now they should match and we can work in similar versions.