Added better querying to Jack

hahaha