WIP.  Many form widgets added