Consolidated the interface with what we have

It won't compile because TI is dumb.