More TODO items, ready for 0.0.1 release