work-in-progress update on tnrs refactor