The big consumer/transformer/writer refactor