Issue #27 Lifecycle stuff, ready for final review pass

Before I start implementing this all over the place!
I guess `todo` is the equivalent of `XXX:` in my IDE. 
That being said, yes, I'll create issues for these. Only targeted to the next milestone though (i.e. OSS Beta)