Work on accepting and rejecting new style todo entries