Rudimentary example case.
Atempting to fix some form enable/disable bugs
Merge branch 'master' into examples