First pass adding 2nd index query