Made numerous changes in the different files to get this to work with mutexes so on and so forth. Committing now with what I have to save this state. Will now go back and clean things up. Looks like we are sticking with a std::set rather than std::unordered_set since I have been able to get the std::set working.