Uploader works quite nicely now. Fixes #27