changed the way models are defined. had to get this out