LPS-43575 Preliminary commit to start working on this task

This is just an initial commit, but not finished in any way. I can work with you to finalize it