diff --git a/applecorn.po b/applecorn.po
index fa15377..e1651b7 100644
Binary files a/applecorn.po and b/applecorn.po differ
diff --git a/applecorn.s b/applecorn.s
index e43f2f5..a8de2bd 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -169,6 +169,7 @@ MAINZP      MAC
             PUT   MAINMEM.INIT
             PUT   MAINMEM.SVC
             PUT   MAINMEM.PATH
+            PUT   MAINMEM.WILD
             PUT   MAINMEM.LISTS
             PUT   MAINMEM.MISC
             PUT   AUXMEM.MOSEQU
diff --git a/mainmem.svc.s b/mainmem.svc.s
index f3b0a20..7436663 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -684,6 +684,7 @@ CATALOGRET
 * Set prefix. Used by *CHDIR to change directory
 SETPFX       >>>   ENTMAIN
              JSR   PREPATH            ; Preprocess pathname
+             JSR   WILDCARD           ; EXPERIMENTAL
              BCS   :ERR
              LDA   #<MOSFILE
              STA   SPFXPL+1
diff --git a/mainmem.wild.s b/mainmem.wild.s
index a92806c..f1d600a 100644
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@@ -171,12 +171,31 @@ MATCHENT LDA  #<BLKBUF+4  ; Skip pointers
         BRA  :L1
 :S1     LDY  #$00
         LDA  (A1L),Y     ; Length byte
-        BEQ  :EXIT       ; Inactive entry
+        BEQ  :NOMATCH    ; Inactive entry
         INC  A1L         ; Inc ptr, skip length byte
-        BCC  :S2
+        BNE  :S2
         INC  A1H
-:S2     JSR  MATCH       ; Wildcard match
-:EXIT   RTS
+:S2     JSR  MATCH       ; Try wildcard match
+        BCC  :NOMATCH
+        LDA  A1L         ; Decrement ptr again
+        BNE  :S3
+        DEC  A1H
+:S3     DEC  A1L
+        LDY  #$00        ; If matches, copy matching filename
+        LDA  (A1L),Y     ; Length of filename
+        AND  #$0F        ; Mask out other ProDOS stuff
+        STA  SEGBUF
+        TAY
+:L2     CPY  #$00
+        BEQ  :MATCH
+        LDA  (A1L),Y
+        STA  SEGBUF,Y
+        DEY
+        BRA  :L2
+:MATCH  SEC
+        RTS
+:NOMATCH CLC
+        RTS
 
 * From: http://6502.org/source/strings/patmatch.htm
 * Input:  A NUL-terminated, <255-length pattern at address PATTERN.
@@ -184,8 +203,8 @@ MATCHENT LDA  #<BLKBUF+4  ; Skip pointers
 * Output: Carry bit = 1 if the string matches the pattern, = 0 if not.
 * Notes:  Clobbers A, X, Y. Each * in the pattern uses 4 bytes of stack.
 
-MATCH1  EQU "?"         ; Matches exactly 1 character
-MATCHN  EQU "*"         ; Matches any string (including "")
+MATCH1  EQU '?'         ; Matches exactly 1 character
+MATCHN  EQU '*'         ; Matches any string (including "")
 PATTERN EQU SEGBUF+1    ; Address of pattern
 STR     EQU A1L         ; Pointer to string to match