more scaffolding, locks go into lists within threads on acquire. should not have broken anything