Working on form integration