More work on uploader POC