Implementing form properly
tweaking naming
Merge pull request #21 from fox-squirrels-2013/dk

Implementing form properly