here's the heart of the pr.  this is roughly what I want the "new" view to look like.