Models and form changes
Merge pull request #9 from rocketu/logic

Models and form changes