Slightly fixed recording...  Actually still pretty borked, but I wanted to
commit these changes before working on the real fix...