LPS-43407

Hey Ray,

Sending this to you since you wrote the class, but let me know if it should go to someone else.

Thanks.