Getting closer to full upload functions