Latest changes prior to authentication changes.
Latest changes for checkpoint of working code except for the upload.