Preparing Project for concurrency

Preparing for ConcurrentDictionary or lock(HashSet)... that way the
threading can be thread-safe