Completed initial implementation, with file upload disabled