Rough draft of part of the templates, forms

Also features a small model update.
This change will mostly be overwritten, but is being pushed
to minimize pending complexity.
Commiting some local files before rebase.