Add ability to output when read.
Code rearranging.