Got concurrency working, but still have a known bug