Lock on a per-volume basis (WIP)

Add fancy locking decorators (WIP)