updated draft edit to accomodate the model and worked on the form