initial commit
now working for simple case. Need tests and work on query() method