#22 working on queries and findAll