Closes #392 adding dynamic form for Version One
Merge commit '76409a2eb3570e74690ddd58b8766c6c2b4c4327' into HEAD