Finished implementing structure for other models as well
Small changes to use model in view