Lps 47071

Brian, please don't close the ticket.

After you refactor and merge this in, I will start to apply it.