no need to save! after upload!
Better exception handling and tests