added models and all the bullshit