Save indicators

This is a good start, don't see any reason not to merge.