working empty forms now this should now be ready to fill in
forms controller merge conflict