Continued interface rework

Unfinished.