Rework table entry to be _ID
finished import and export
Merge branch 'awan'
Merge branch 'gcox1'
merging
cleaning up graph