Locking as util
Move and test relev