Re-enable locations
Add lockfile