major form updates. Blog post to come
commiting unzipped version