Finish development of first extractor, starting second version