LPS-20730

Hi Nate, I was checking out this issue so that I understand more how we're doing things. I have found a solution but of course I'm not sure if this is the best one, so please take a look at it. Thanks.