Continued modification and seperation of db model from forms.