Lockfile 2.0 - cleaned branch

this branch remedies a merge conflict from #363. See #363 for full details.