Revert "Models and form changes"
Merge pull request #12 from rocketu/revert-9-logic

Revert "Models and form changes"