Finished (for now) normalizing the database