adds a bunch of quick hacks.
Merge branch 'feature/merging' into develop