Made some changes that I think my Adam was alluding to.
  Still not entirely sure the implications.
Clean up.
Finally figured out what I was doing wrong with these two views.
  Everything is working according to my original design (sinister laugh!)
Merge branch 'user/message'