Switched to storing info in Application
Merge pull request #91 from moorej12/master

Switched to storing info in Application