Done..

The link on the combined row is a little off due to split cpid's messing up the offset earlier in the list. Not too much I can do about that at the moment.