Adds form fields, updates data models
fixes conflicts