major refactor
Merge branch 'master' of github.com:pmorissette/torget