first cut at adding includes for ids for use in queries