PR for code review.

What is the value of this class?  Seems like it could be removed?