Some more work on the interface