Cleanup.
Fix the naming of the var's to match the actual naming.
Added model object blue prints
cleanup.
Refactoring.
Merge pull request #4 from elmoswelt/elmar/development

Elmar/development