Work on file uploads (#22).  Adding testing work as well.