WIP: Getting a little closer, but have encountered an oddness in upload paths