Updated solution to work with MVC as well as some sample renderings