Index: /fmts/trunk/p/C0XPT0.m
===================================================================
--- /fmts/trunk/p/C0XPT0.m	(revision 1621)
+++ /fmts/trunk/p/C0XPT0.m	(revision 1622)
@@ -1,3 +1,3 @@
-C0XPT0 ; VEN/SMH - Get patient data and do something about it ;2013-05-03  6:09 PM
+C0XPT0 ; VEN/SMH - Get patient data and do something about it ;2013-05-06  9:47 AM
  ;;1.1;FILEMAN TRIPLE STORE;;
  ; (C) Sam Habiel 2013
@@ -187,6 +187,7 @@
  QUIT
  ;
-NP() ; New Person Entry
-	Q:$O(^VA(200,"B","PROVIDER,UNKNOWN SMART",0)) $O(^(0)) ; Quit if the entry exists
+NP() ; Private ; New Person Entry
+	N NAME S NAME="PROVIDER,UNKNOWN SMART" ; Constant
+	Q:$O(^VA(200,"B",NAME,0)) $O(^(0)) ; Quit if the entry exists with entry
 	;
 	N C0XFDA,C0XIEN,C0XERR,DIERR
@@ -202,5 +203,8 @@
 	Q C0XIEN(1) ;Provider IEN
 	;
-HL() ; Hospital Location Entry
+HL() ; Private; Hospital Location Entry
+	N NAME S NAME="SMART PATIENT LOCATION" ; Constant
+	Q:$O(^SC("B",NAME,0)) $O(^(0)) ; Quit if the entry exists with the entry
+	;
 	N C0XFDA,C0XIEN,C0XERR,DIERR
 	S C0XFDA(44,"?+1,",.01)="SMART PATIENT LOCATION" ; Name
Index: /fmts/trunk/p/C0XPT4.m
===================================================================
--- /fmts/trunk/p/C0XPT4.m	(revision 1621)
+++ /fmts/trunk/p/C0XPT4.m	(revision 1622)
@@ -1,3 +1,3 @@
-C0XPT4 ; VEN/SMH - Encounter Processing;2013-05-03  5:11 PM
+C0XPT4 ; VEN/SMH - Encounter Processing;2013-05-06  9:42 AM
  ;;1.0;FILEMAN TRIPLE STORE;
  ; (c) 2013 Sam Habiel
@@ -17,5 +17,5 @@
 	. S STARTDATE=$$FMDATE(STARTDATE)
 	. W " ",STARTDATE
-	. D HISTENC(STARTDATE,DFN) ; Historical Encounter Private API
+	. D ONEENC(STARTDATE,DFN) ; File One Encounter Private API
 	K ^TMP($J,"ENC") ; data location
 	QUIT
@@ -35,12 +35,12 @@
 	;
 	;
-HISTENC(DATE,DFN,FTLOC,COMMENT) ; Private Proc; Historical Encounter Filing into the VISIT file
+ONEENC(DATE,DFN,FTLOC,COMMENT) ; Private Proc; One Encounter Filing into the VISIT file
 	; Input:
 	; - DATE: FM DATE of VISIT (Scalar) - Required
 	; - DFN (Scalar) - Required
-	; - FTLOC: Free Text Location - Optional. Defaults to SMART LOCATION
-	; - COMMENT: Free Text Comment - Optional. Defaults to Imported from Smart
+	; - FTLOC: (Scalar) Free Text Location - Optional. Defaults to SMART LOCATION
+	; - COMMENT: (Scalar) Free Text Comment - Optional. Defaults to Imported from Smart
 	; Output:
-	; - Creates V file entries for the historical encounter
+	; - Creates V file entries for encounter
 	;
 	; Handle required and optional variables...
@@ -61,10 +61,12 @@
 	S C0XDATA("ENCOUNTER",1,"HOS LOC")=$$HL^C0XPT0()
 	S C0XDATA("ENCOUNTER",1,"SERVICE CATEGORY")="A" ; Ambulatory
-	S C0XDATA("ENCOUNTER",1,"OUTSIDE LOCATION")="FROM THE WIDE WORLD"
+	S C0XDATA("ENCOUNTER",1,"OUTSIDE LOCATION")=FTLOC
 	S C0XDATA("ENCOUNTER",1,"ENCOUNTER TYPE")="P" ; Primary
+	S C0XDATA("ENCOUNTER",1,"COMMENT")=COMMENT
 	S C0XDATA("PROVIDER",1,"NAME")=$$NP^C0XPT0()
 	; Diangosis and procedure necessary so visit will show up in ^SDE.
+	; We invent them here.
 	S C0XDATA("DX/PL",1,"DIAGNOSIS")=$O(^ICD9("BA","V70.3 ",0))
-	S C0XDATA("PROCEDURE",1,"PROCEDURE")=$O(^ICPT("B","99201",0))
+	S C0XDATA("PROCEDURE",1,"PROCEDURE")=$O(^ICPT("B","99212",0))
 	S C0XDATA("PROCEDURE",1,"QTY")=1
 	;
@@ -72,5 +74,5 @@
 	N XQORMUTE S XQORMUTE=1 ; Unwinder: Shut the hell up. Don't execute disabled protocols rather than whining about them.
 	N OK S OK=$$DATA2PCE^PXAPI($NA(C0XDATA),PKG,SRC,.C0XVISIT,,,.C0XERR)
-	I OK<1 S $EC=",U1,"
+	I OK<1 S $EC=",U1," ; Invalid value is -1
 	QUIT
 	;
@@ -79,5 +81,5 @@
 	; BE VERY CAREFUL USING THIS...
 	; Walk through the C X-Ref for this patient
-	N I S I=9000010  ; Hit the VISIT file LAST as some xrefs in other files point to it!
+	N I S I=9000010  ; Hit the VISIT file LAST as V files point to it!
 	N DIK,DA
 	F  S I=$O(^DIC(I)) Q:I'<9000011  D  ; For each V File...