I have managed to find time to get back to this project and round 3 of the separate round version is finished.
I am still patiently and slowly undoing the other version back to the mistake so that I can achieve my aim of working it with no joins.  I can only do a little at a time as it is very titing to my eyes