Early attempt to re-implement solution scattering pipeline