Basic locking working, without timeouts