Rolodex repack

This is essentially the same content as PR 26, without the line ending changes