better naming
added the draft of Query class
added a developing test