Have all types of data now populating.  Still minor work to do to move files in S3 to be functional.