Made a start at canonicalising the interface