* Add some TODOS
Merge remote-tracking branch 'simon/master'
buggy, working towards notebook completion