Model Form layer + tests
Update JSON generator to use 3 keys. Update genhtml to include model forms