Started on some basic CQRS
Merge branch 'tmp'