First work on the new interface.