Have necessary filters now need to display

Should now have everything ready to display a grid with the right info.
Need to write these queries and an overloaded function that will take a
set amount of parameters