uploader port

starting to move the uploader over