Derecording, rs=derecording

Most work done by @luqmana and @pcwalton - I just rebased.