Totally fubared the architecture of the application. Hope you like it
Merge pull request #5 from dallbee/master

Architecture Redesign