cleaned up the forms, just define the ones that are special and let the model do the work