todor v2
Merge pull request #58 from mattswann/master

todor v2 - working ish