Messed with the models to make them work together better, more accurately
represent the data.