(WIP) Sketch out some new interfaces