Refactor in progress, removing second array from reader/writers