Chg: views refactor begin