Final DRY/refactorings to upload system. Closes #68.