Added file uploads and other niceties

@kitanata review me