Passed to Tom for code review.