OZP-692: Refactor to use List.js