Getting closer to MVC pattern.