Stolen with love from 7dda0bc7cb
7dda0bc7cb
This is an attended update, which is better. Eventually replace watchtower
Required a lot of renaming :(