There has been a major star again process.
This is a better base to carry on refractoring.