Added some bells and whistles to the upload