Lockfile 2.0

Attempt #2 at at #274