moved cel and dun helpers into common 2dhelper class