Pj/refactor form

[pablisch]

This PR is built on the earlier make-counter-work branch and so includes all that code within it.