Multi tumour - intermediate merge

Still testing some issues with called code, but actual structure should be fine.