Implement lock & unlock, lack of tests