Added more files.  Created the extractor