Some more work on CellML integration, which I had to cut off.