Started form generation
Merging my laptop changes with desktop. There should be no conflicts.

Merge branch 'master' of https://github.com/Logiraptor/nemesis