Following NAPA study, OPM details broad plans to chart a new course