find -> fetch, refactor query out to another class