1st move toward CQRS