Refactoring. Updating to latest approach. Using new pjs-util.