Make the basic locking resolver work

Lots of hacks in there, but the simple cases work!
httpS for everything