Kazoo lock (ready for review)

Changed locking from silverberg to kazoo.