some reorganization -- upload saves file (no error catches)