Finished up the relationships so everything is related now