Interim work on client / server locking system