Testing some 2d tweaks
A better way of making this work.
Merge pull request #4 from CROMBi-kk/testing

merge into kk4.4