Started looking at fixing the manual upload.

Didn't finish, but wanted to check this in before heading on a break.