working on TS, just added query object