Naughty messy commit just so Tom can see where I've got to. Still
separating out Autoresponse and Trip