checking stuff
final set of mappings and new queries