Refactor to promote lock

I think this gets locks to a basic 'working' state, excluding expiration.