update to form handler

basic now works