Rejigged SolidSolution class