solidifies, but meh... another rewrite? prolly.