Work on form field generation