making changes to allow for saving of multiple form types