LPS-31452

Heya Julio, here's my changes for the pull you sent. I'm going to close out the current one, but you can have Mate review the backend separately. Thanks\!