Half way to building out uploader

TODO: Switch to schemas from Extracts