Started adding form fields