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

Dev/distributed upgrades
WIP
More WIP fixes
fixes
fixes