Adam/advanced form

This will get master up to date with what's on heroku