Changed how I'm going to seperate the models and views