master: a-0 moved a bunch of stuff into interfaces