Beginning to add support for file upload