LGS-173/LPS-33812

Hey, Nate.

Here's what we have so far on this.  I know there are a couple bugs noted in LGS-173 but it should be a good starting point.

Thanks,
Nathan