Fix Foreign Key relationship, do away with petty table
Fix up