Looks like we need to add some associations here for the other models.