Adding support for generating form objects.  WIP