Closes #392 adding dynamic form for Version One