Working on combining all views and models