Adding ThreadLock and commented attempt at use of CallbackProxy