closer still. Threads are still accessed weirdly in some places