Allow calculating indicators on scenarios

Formatting is a little weird here