working on the forms
merged files