Still working on the uploading