Refactored pointCtrl; waterchain layer working in new style