Merge is a little neater now. Debugging output might need cleaning up.
Merge branch 'SplitBetter' of https://github.com/Sam-son/P21e3-Merge-Split-Tools into SplitBetter
Merge branch 'SplitBetter'