major design changes
Merge pull request #5 from bloodrabbit/master

major design changes