Changed datamodel to have condition type and location and updated forms, edit forms to reflect it, fully functional with new model