moving th loaded modules to the template
minor refactors; playing around with beginning to add test coverage
Merge pull request #11 from rsby/master

moving th loaded modules to the template; minor refactors; playing around with beginning to add test coverage