Added ability to upload and extract