Have it all working in one table. Need to split out states and party tables