Finalized data extraction and storage, need to test!