bunch of model stuff added