Big 'ol simplify and refactor.  Now using lots of querystring parameters for the endpoints.