Begin refactor to make visualisations require an indicator