Fixreferences Merge

Merge initial FixReferences code into codebase.  One outstanding issue with logging and parallel threads.