Locks complete, Conditions working on
Merge branch 'master' of https://github.com/jeche/OPS