Lots of progress on cloud types - half finished