partially implemented file upload viewing, more consistent naming practices
updated with merge