More changes to the reader module

Not getting there very quickly with DI, it seems :/