many many changes to the model structure and Forms adfded to forms.py