Feature/indicator service refactor

Part 1 of Indicator Service refactor. Details in commit notes.