Done for now - still have eqns around the outside!