Mostly done with the tables

duplicates are showing up however.