classes for cloud implemented
Merge branch 'liani'
indentations changed to tabs
commit?
change indentations to spaces