Added better querying to Jack

I guess this is really where the indentation needs to change