finally have the models how I want them