Nishi, Abhi #000 moving big query to contrib