More work on the interface.