some locking, altho we may need some more for the new CRUD bits