initial support for form handler
resolved merge conflict