Refactor some of this
Can search with params

But this feels hacky