Further shift to knockout.js