working forms again
merge conflicts on application.html