Make swap interface match Sayer's mock-ups!!