More upload stuff (#1)