Minor reordering.
Cloud client coded. Ready to test.