Type changes and switching out the readers. 

I think my unanswered pull request was blocking this one so I am resubmitting it.