More work on the interface and inputs.