Complete file upload feature and do more work on sorting.