support for locks... untested, but doesn't break quick run of a sample of test cases