Some incomplete work on editing/uploads.