@cantino would appreciate a review.

I wasn't sure the cleanest way to do this and I'm open to any other suggestions.