Add beginnings of time based locking