Wee bit of rejiggerin' and also seriously amended the TODO doc.