Make CM_App less global