Wip
Change tables and add Seed Data