moving some code around
stopgap commit for last failing tests; error detection works, but reporting is null-er-ific
all tests pass, error reporting and perf still need work