File upload

can we merge file-upload capabilities into master?