More stat groundwork, added map queries file