Merge pull request #18 from pmorie/dev/distributed-upgrades

Dev/distributed upgrades
WIP
Merge pull request #19 from pmorie/dev/distributed-upgrades

Dev/distributed upgrades
More WIP
Fixes