Changed the model, Added more classes that we need. Also changed the structure slightly to the point I think that it is most efficient, though I have to run it by the TA cause I want to make sure. but we can use it right now, and if I change anything than I will change it everywhere.