OK I made a start at this with 23ac2a5 when I did my merge cause I didn't see this at the time - but haven't had time to keep working on it the last couple of days. I've pushed up what I had done - what's easier - for me to keep doing it or you to get this in sync or?
Conflicts fixed...