More work on the guts of the preprocessing stuff;