- completing Domain implementation (work in progress)
- implementing query model