More recording logic...  Mostly there, but not there yet...