Adding a lot of query stuff.