Change from yield to return; don't want to delay any errors
Removed cruft, fixed regex
Sketch future plans; remove cruft; save/rename old report.tsv files