LPS-32056

Had a difficult time with the naming. Let me know if you need me to change it.

Thanks!