New helpers tested, tasks now in TODO.txt.