Account for additional special vals, additional logging, nest session diagnostic rollback for per file (memory issues otherwise)