More testing / tweaking or mutexes & concurrent queue