begin breaking things up and adding unit tests around queries
add more possible query parameters