Intermediate commit for interface stuff...