Switching things over to MVC style.