Working on the file uploads in the main body of the issue