Updated TODO (and we're off to bed!)