Watch n lock

Bare minimal support for lock, retry and eternal watching