Merged local and cloud versions

Bring all working versions up to date