Added a few fields, the rendering works pretty well.