updated some stuff, about to revert conversion to model form
fixed conflicts and reverted commit that converted manager form to use model form