Another major refactoring of how results are collected and written out