Feature/uploader

@smathieu could you check this out - works locally