Updating to MVC system now that everything works