didn't commit this earlier
also have to do the foreign key change as a rework