Starting to work, woo
Merge branch 'master' of github.com:Paretzky/tbd