major changes to forms.py