LPS-36534

Sending this to you because it has a bit of js and I think nobody has reviewed it. You can ignore the rest of the changes in this pull since I've already reviewed them