Worked a bunch on command_query