Partially finished with uploader revamp.