Add a couple todo's
Merge branch 'master' into ansible