More reader moves. Getting better. Almost there.