Redo the extractor code

This damned sh*t  screwed all my work. Have to redo everything from
nothing.