Began integration with wi-queries
Finished integration with wi-queries

Finished integration with wi-queries
Added reflection to simplify code