diff --git a/comments/typed-cross-phase-structs-wrappers.rkt b/comments/typed-cross-phase-structs-wrappers.rkt
new file mode 100644
index 00000000..6d35dfef
--- /dev/null
+++ b/comments/typed-cross-phase-structs-wrappers.rkt
@@ -0,0 +1,27 @@
+#lang typed/racket
+
+(require typed/racket/unsafe)
+(require "untyped-cross-phase-structs-wrappers.rkt")
+(unsafe-require/typed "untyped-cross-phase-structs-wrappers.rkt"
+                      [#:struct (A) NonSexp ([v : A]) #:type-name NonSexpOf]
+                      [#:struct (A) NonSyntax ([v : A]) #:type-name NonSyntaxOf]
+                      [#:struct (A) Some ([v : A])])
+
+;(require typed-racket/base-env/prims-struct)
+;(dtsi* (A) NonSexp NonSexpOf ([v : A]) #:maker make-NonSexp)
+
+(provide (struct-out NonSexp))
+;(struct (A) NonSexp ([v : A]) #:type-name NonSexpOf #:constructor-name make-NonSexp)
+
+#;(module* test typed/racket
+  (require (submod ".."))
+  (require typed/rackunit)
+  (check-pred procedure? NonSexp)
+  (check-pred NonSexp? (ann (ann (NonSexp 1) (NonSexpOf Number)) Any))
+  (check-not-exn
+   (λ ()
+     (ann (let ([n : (NonSexpOf Any) (NonSexp 1)])
+            (if (number? (NonSexp-v n))
+                (NonSexp-v n)
+                0))
+          Number))))
\ No newline at end of file
diff --git a/comments/typed-cross-phase-structs.rkt b/comments/typed-cross-phase-structs.rkt
new file mode 100644
index 00000000..01e24d1d
--- /dev/null
+++ b/comments/typed-cross-phase-structs.rkt
@@ -0,0 +1,47 @@
+(module typed-cross-phase-structs '#%kernel
+  (#%declare #:cross-phase-persistent)
+
+  (#%provide struct:NonSexp make-NonSexp NonSexp? NonSexp-ref)
+  (define-values (struct:NonSexp make-NonSexp NonSexp? NonSexp-ref NonSexp-set!)
+    (make-struct-type 'NonSexp ;; name
+                      #f ;; parent
+                      1 ;; arguments to the constructor
+                      0 ;; auto-fields
+                      #f ;; auto-v
+                      '() ;; props
+                      #f ;; inspector
+                      #f ;; proc-spec
+                      (list 0) ;; immutables
+                      #f ;; guard
+                      'NonSexp ;; constructor-name
+                      ))
+  
+  (#%provide struct:NonSyntax make-NonSyntax NonSyntax? NonSyntax-ref)
+  (define-values (struct:NonSyntax make-NonSyntax NonSyntax? NonSyntax-ref NonSyntax-set!)
+    (make-struct-type 'NonSyntax ;; name
+                      #f ;; parent
+                      1 ;; arguments to the constructor
+                      0 ;; auto-fields
+                      #f ;; auto-v
+                      '() ;; props
+                      #f ;; inspector
+                      #f ;; proc-spec
+                      (list 0) ;; immutables
+                      #f ;; guard
+                      'NonSyntax ;; constructor-name
+                      ))
+
+  (#%provide struct:Some make-Some Some? Some-ref)
+  (define-values (struct:Some make-Some Some? Some-ref Some-set!)
+    (make-struct-type 'Some ;; name
+                      #f ;; parent
+                      1 ;; arguments to the constructor
+                      0 ;; auto-fields
+                      #f ;; auto-v
+                      '() ;; props
+                      #f ;; inspector
+                      #f ;; proc-spec
+                      (list 0) ;; immutables
+                      #f ;; guard
+                      'Some ;; constructor-name
+                      )))
\ No newline at end of file
diff --git a/comments/untyped-cross-phase-structs-wrappers.rkt b/comments/untyped-cross-phase-structs-wrappers.rkt
new file mode 100644
index 00000000..a1e5cebf
--- /dev/null
+++ b/comments/untyped-cross-phase-structs-wrappers.rkt
@@ -0,0 +1,48 @@
+#lang racket
+
+(require "typed-cross-phase-structs.rkt"
+         (for-syntax racket/struct-info))
+
+(define-syntax-rule (define+provide-struct-wrapper-single-field
+                      [struct:S make-S S? S-ref S field S-field S-struct-info]
+                      ...)
+  (begin
+    (begin
+      (provide (struct-out S))
+      (define S-field
+        (values (make-struct-field-accessor S-ref 0 'field)))
+      (begin-for-syntax
+        (struct S-struct-info ()
+          #:transparent
+          #:property prop:struct-info
+          (λ (self)
+            (list #'struct:S
+                  #'make-S
+                  #'S?
+                  (list #'S-field) ;; in reverse order
+                  (list #f) ;; in reverse order
+                  #t))
+          #:property prop:set!-transformer
+          (lambda (stx)
+            (syntax-case stx (set!)
+              [(set! id _)
+               (raise-syntax-error 'set! "Cannot mutate struct identifier" stx)]
+              [id
+               (identifier? #'id)
+               #'make-S]
+              [(id . args)
+               (identifier? #'id)
+               (syntax/loc stx
+                 (make-S . args))]))))
+      (define-syntax S (S-struct-info)))
+    ...))
+
+(define+provide-struct-wrapper-single-field
+  [struct:NonSexp make-NonSexp NonSexp? NonSexp-ref
+                  NonSexp v NonSexp-v NonSexp-struct-info]
+
+  [struct:NonSyntax make-NonSyntax NonSyntax? NonSyntax-ref
+                    NonSyntax v NonSyntax-v NonSyntax-struct-info]
+
+  [struct:Some make-Some Some? Some-ref
+               Some v Some-v Some-struct-info])