Adding what seems to be most of the s-step, just missing stuff that touches domains and general size of s.