still working on adopting to cqrs