added uploading! all scott's code