Add some ConcurrentHashMaps and debug messages as per the advise of hcherndon