Really nice that we have factored out the two big readcf methods. I had ...

Lots of cleanup espcially of the big / mostly duplicate /read cf function