Working on making tables into 3NF