Got rid of two tables, looks better as one