diff --git a/p/GPLCCR.m b/p/GPLCCR.m
index 2bbdbce..2f688da 100644
--- a/p/GPLCCR.m
+++ b/p/GPLCCR.m
@@ -99,7 +99,9 @@ CCRRPC(CCRGRTN,DFN,CCRPART,TIME1,TIME2,HDRARY)  ;RPC ENTRY POINT FOR CCR OUTPUT
 INITSTPS(TAB)  ; INITIALIZE CCR PROCESSING STEPS
     ; TAB IS PASSED BY NAME
     W "TAB= ",TAB,!
+    ; ORDER FOR CCR IS PROBLEMS,FAMILYHISTORY,SOCIALHISTORY,MEDICATIONS,VITALSIGNS,RESULTS,HEALTHCAREPROVIDERS
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
+    ;D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITALS;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
     Q
     ;
diff --git a/p/GPLMEDS.m b/p/GPLMEDS.m
index f9dedeb..f3eaa86 100644
--- a/p/GPLMEDS.m
+++ b/p/GPLMEDS.m
@@ -1,4 +1,4 @@
-GPLVITALS ; CCDCCR/CJE - CCR/CCD PROCESSING FOR MEDICATIONS ; 07/16/08
+GPLMEDS ; CCDCCR/CJE - CCR/CCD PROCESSING FOR MEDICATIONS ; 07/16/08
  ;;0.1;CCDCCR;;JUL 16,2008;
  ;Copyright 2008 WorldVistA.  Licensed under the terms of the GNU
  ;General Public License See attached copy of the License.
@@ -17,41 +17,59 @@ GPLVITALS ; CCDCCR/CJE - CCR/CCD PROCESSING FOR MEDICATIONS ; 07/16/08
  ;with this program; if not, write to the Free Software Foundation, Inc.,
  ;51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ;
-          W "NO ENTRY FROM TOP",!
-          W !
-          Q
-          ;
+ W "NO ENTRY FROM TOP",!
+ W !
+ Q
+ ;
 EXTRACT(MEDXML,DFN,MEDOUTXML)          ; EXTRACT MEDICATIONS INTO PROVIDED XML TEMPLATE
           ;
           ; MEDXML AND OUTXML ARE PASSED BY NAME SO GLOBALS CAN BE USED
           ; IMEDXML WILL CONTAIN ONLY THE MEDICATIONS SECTION OF THE OVERALL TEMPLATE
           ;
           N MEDRSLT,J,K,MEDPTMP,X,MEDVMAP,TBUF
-          ; REPLACE ME WITH MEDS RPC!!
+          D ACTIVE^ORWPS(.MEDRSLT,DFN)
+          ZWR MEDRSLT
+          Q
           I '$D(MEDRSLT(1)) W "ERROR RUNNINIG MEDICATIONS RPC",! Q
-          ; ZWR RPCRSLT
-          S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"VITALS"))
-          S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"VITALARYTMP"))
-          F J=1:1:MEDRSLT(1)  D  ; FOR EACH MEDICATION IN THE LIST
-          . I $D(MEDRSLT(J)) D
-          . . S MEDVMAP=$NA(@MEDTVMAP@(J))
-          . . K @MEDVMAP
-          . . I DEBUG W "VMAP= ",VMAP,!
-          . . S MEDPTMP=MEDRSLT(J) ; PULL OUT MEDICATION FROM RPC RETURN ARRAY
-          . . S @MEDVMAP@("MEDDATAOBJECTID")="VITAL"_J ; UNIQUE OBJID FOR MEDICATION
-          . . ; PROCESSING FOR MEDS GOES HERE
-          . . S MEDARYTMP=$NA(@MEDTARYTMP@(J))
-          . . K @MEDARYTMP
-          . . D MAP^GPLXPATH(MEDXML,MEDVMAP,MEDARYTMP)
-          . . I J=1 D  ; FIRST ONE IS JUST A COPY
-          . . . ; W "FIRST ONE",!
-          . . . D CP^GPLXPATH(MEDARYTMP,MEDOUTXML)
-          . . . ; W "OUTXML ",OUTXML,!
-          . . I J>1 D  ; AFTER THE FIRST, INSERT INNER XML
-          . . . D INSINNER^GPLXPATH(MEDOUTXML,MEDARYTMP)
-          ; ZWR ^TMP($J,"VITALS",*)
-          ; ZWR ^TMP($J,"VITALARYTMP",*) ; SHOW THE RESULTS
-          ; ZWR @OUTXML
+          S MEDTVMAP=$NA(^TMP("GPLCCR",$J,"MEDICATIONS"))
+          S MEDTARYTMP=$NA(^TMP("GPLCCR",$J,"MEDARYTMP"))
+          F J=1:1 Q:'$D(MEDRSLT(J))  D  ; FOR EACH MEDICATION IN THE LIST
+          . S MEDVMAP=$NA(@MEDTVMAP@(J))
+          . K @MEDVMAP
+          . I DEBUG W "VMAP= ",VMAP,!
+          . S MEDPTMP=MEDRSLT(J) ; PULL OUT MEDICATION FROM RPC RETURN ARRAY
+          . S @MEDVMAP@("MEDICATIONOBJECTID")="MED"_J ; UNIQUE OBJID FOR MEDICATION
+          . ; PROCESSING FOR MEDS GOES HERE
+          . S @MEDVMAP@("MEDICATIONDATETIMETEXT")=$$FMDTOUTC^CCRUTIL($P(MEDPTMP,"^",11),"DT")
+          . S @MEDVMAP@("MEDICATIONDATETIMEAGE")="TEST2"
+          . S @MEDVMAP@("MEDICATIONDATETIMEAGEUNITS")="TEST3"
+          . S @MEDVMAP@("MEDICATIONTYPETEXT")="TEST4"
+          . S @MEDVMAP@("MEDICATIONSTATUSTEXT")=$P(MEDPTMP,"^",10)
+          . S @MEDVMAP@("MEDICATIONSOURCEACTORID")="TEST6"
+          . S @MEDVMAP@("MEDICATIONPRODUCTNAMETEXT")="TEST7"
+          . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVALUE")="TEST8"
+          . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODINGINGSYSTEM")="TEST9"
+          . S @MEDVMAP@("MEDICATIONPRODUCTNAMECODEVERSION")="TEST10"
+          . S @MEDVMAP@("MEDICATIONBRANDNAMETEXT")="TEST11"
+          . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVALUE")="TEST12"
+          . S @MEDVMAP@("MEDICATIONBRANDNAMECODINGSYSTEM")="TEST13"
+          . S @MEDVMAP@("MEDICATIONBRANDNAMECODEVERSION")="TEST14"
+          . S @MEDVMAP@("MEDICATIONSTRENGTHVALUE")="TEST15"
+          . S @MEDVMAP@("MEDICATIONSTRENGTHUNIT")="TEST16"
+          . S @MEDVMAP@("MEDICATIONFORMTEXT")="TEST17"
+          . S @MEDVMAP@("MEDICATIONDIRECTIONDESCRIPTIONTEXT")="TEST18"
+          . S @MEDVMAP@("MEDICATIONDIRECTIONDOSEVALUE")="TEST19"
+          . S @MEDVMAP@("MEDICATIONDIRECTIONROUTETEXT")="TEST20"
+          . S @MEDVMAP@("MEDICATIONDIRECTIONFREQUENCYVALUE")="TEST21"
+          . S J=J+3
+          . S MEDARYTMP=$NA(@MEDTARYTMP@(J))
+          . K @MEDARYTMP
+          . D MAP^GPLXPATH(MEDXML,MEDVMAP,MEDARYTMP)
+          . I J=1 D  ; FIRST ONE IS JUST A COPY
+          . . ; W "FIRST ONE",!
+          . . D CP^GPLXPATH(MEDARYTMP,MEDOUTXML)
+          . I J>1 D  ; AFTER THE FIRST, INSERT INNER XML
+          . . D INSINNER^GPLXPATH(MEDOUTXML,MEDARYTMP)
           N MEDTMP,I
           D MISSING^GPLXPATH(MEDOUTXML,"MEDTMP") ; SEARCH XML FOR MISSING VARS
           I MEDTMP(0)>0 D  ; IF THERE ARE MISSING VARS - MARKED AS @@X@@