WIP
Complete more command/query
WIP command/query clearance
Merge branch 'command-query'