more TODOs
Merge branch 'master' of github.com:cbilson/scoop-cbilson