Added upload - needs testing