Lots of rearranging & additions to the extraction model.