Merge branch 'master' into esegev
Merge branch 'master' into esegev
Form functionality

Added funcitonality to form and made a few other subtle changes.
Merge branch 'esegev'