Started work on queries and iterables again.