Multiple underlyings working sort-of. Worth committing. Need to desk check it now.