Moved some of the interfaces around to match my package for v0