Basics working, can't handle restart of a master yet...
Handle failures of upstream masters
Update notes