Working on upload capability