Prepping stuff to change to new pipeline.