A lot of tweaking to the file uploaders