Added messages to the view
refactored orgs and people to use _form and then made an errors partial
merged branch resolved merge conflicts