More refactoring, read side progress.