After this we should be able to remove some references to threading and instead use the data in the annotation.
