Ttp vs indicator

Let's go ahead and merge this one into master.