Major cloud code re-factor.  Everything seems to be working well