Add indicators, click interaction
merge conflict