Remaining: keyboard edit and uploading