Updated some of the Controllers and Models. Still Broken