start on query state and add wak solution in test