Cleaned up the code a little

Having decided that we're just going with the simple version for now,
bit that bullet and recoded.
We now display the upload status

Only shows upload, not the post-processing, but it's still a big
improvement.