Todo's

And to keep my commit-run of 14 days going ;)