Add some todos
Merge branch 'master' of github.com:nashidau/galvinise