Added some work on the upload feature