More todo items
Galvinise a little more verbose