diff --git a/docs/atlas/proposals/GJ807.json b/docs/atlas/proposals/GJ807.json
new file mode 100644
index 000000000..41295e675
--- /dev/null
+++ b/docs/atlas/proposals/GJ807.json
@@ -0,0 +1,289 @@
+{
+  "system_id": "GJ 807",
+  "proper_name": "Grenzstein",
+  "star_type": "K",
+  "spectral_class": "K0IV",
+  "wiki_data": {
+    "habitable_count": 1,
+    "inhabited_count": 1,
+    "has_gas_giant": true,
+    "has_asteroid_belt": true,
+    "has_horizon_station": true,
+    "raw_bodies_line": null
+  },
+  "bodies": [
+    {
+      "body_id": "GJ807b",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 1,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.71,
+      "orbital_period_days": 130.0,
+      "rotation_period_hours": 3120.0,
+      "atmosphere": "none",
+      "biome_summary": "barren",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "inner rocky; tidally locked at 130-day period × 24 = 3120h rotation; hot dayside, extreme temperatures; no atmosphere; expanded K0IV illumination radius means this planet is in a wider inner orbit than comparable main-sequence systems"
+    },
+    {
+      "body_id": "GJ807c",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 2,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.66,
+      "orbital_period_days": 295.0,
+      "rotation_period_hours": 22.4,
+      "atmosphere": "thick",
+      "biome_summary": "arid",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "dry rocky world in inner-warm range; dense CO2 atmosphere; runaway greenhouse conditions; no settlement possible; surveyed early in Grenzstein founding period"
+    },
+    {
+      "body_id": "GJ807d",
+      "proper_name": "Pierrevert",
+      "body_type": "planet",
+      "orbit_index": 3,
+      "parent_body_id": null,
+      "inhabited": true,
+      "population": 8000,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.91,
+      "orbital_period_days": 620.0,
+      "rotation_period_hours": 27.6,
+      "atmosphere": "breathable",
+      "biome_summary": "temperate-cool",
+      "hydrosphere": "rivers-lakes",
+      "economic_role": "agricultural",
+      "settlement_pattern": "concentrated",
+      "industrial_corridor": "west_reach",
+      "notes": "primary inhabited world; K0IV subgiant outer habitable zone — warm but not intense illumination; slightly reddish stellar light produces vegetation with adapted photosynthetic systems, darker foliage; cooler seasonal cycle than Bout du Chemin; weather patterns require learning; two continents — primary settlement concentrated in temperate plains of main continent; secondary continent highlands contain surveyed geological anomalies (structured surface features found year 3, noted as inconsistent with natural formation, not followed up; second survey year 6 found features absent — both reports in coordinating council files, not forwarded); Wave 5 settlement ~40 years old, started with <2,000, now ~8,000 permanent residents; French-speaking, Bout du Chemin-heritage culture in early identity formation; heavy dependency on Bout du Chemin imports; exports minimal (agricultural raw product, early extraction material)"
+    },
+    {
+      "body_id": "GJ807d-1",
+      "proper_name": null,
+      "body_type": "moon",
+      "orbit_index": 1,
+      "parent_body_id": "GJ807d",
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.07,
+      "orbital_period_days": 24.8,
+      "rotation_period_hours": 595.2,
+      "atmosphere": "none",
+      "biome_summary": "barren",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "Pierrevert's moon; tidally locked; prominent in early settlement sky observations and community calendar-making"
+    },
+    {
+      "body_id": "GJ807-belt",
+      "proper_name": null,
+      "body_type": "asteroid_belt",
+      "orbit_index": 4,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": null,
+      "surface_gravity": null,
+      "orbital_period_days": null,
+      "rotation_period_hours": null,
+      "atmosphere": null,
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "moderate main belt; surveyed in founding period; some early extraction work; no established operations — settlement-phase priorities precluded investment"
+    },
+    {
+      "body_id": "GJ807e",
+      "proper_name": null,
+      "body_type": "gas_giant",
+      "orbit_index": 5,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "gas_giant",
+      "surface_gravity": 2.6,
+      "orbital_period_days": 3500.0,
+      "rotation_period_hours": 9.8,
+      "atmosphere": "hydrogen-helium",
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer gas giant; muted ochre-grey banding; no extraction operations; outer system survey planned but not yet conducted"
+    },
+    {
+      "body_id": "GJ807e-1",
+      "proper_name": null,
+      "body_type": "moon",
+      "orbit_index": 1,
+      "parent_body_id": "GJ807e",
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.10,
+      "orbital_period_days": 14.4,
+      "rotation_period_hours": 345.6,
+      "atmosphere": "none",
+      "biome_summary": "barren",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "inner gas giant moon; unsurveyed"
+    },
+    {
+      "body_id": "GJ807e-2",
+      "proper_name": null,
+      "body_type": "moon",
+      "orbit_index": 2,
+      "parent_body_id": "GJ807e",
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.07,
+      "orbital_period_days": 31.6,
+      "rotation_period_hours": 758.4,
+      "atmosphere": "none",
+      "biome_summary": "ice",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer gas giant moon; icy; unsurveyed"
+    },
+    {
+      "body_id": "GJ807f",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 6,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.46,
+      "orbital_period_days": 9200.0,
+      "rotation_period_hours": 19.4,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer ice-rock world; unsurveyed in 40-year settlement period"
+    },
+    {
+      "body_id": "GJ807g",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 7,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.08,
+      "orbital_period_days": 22000.0,
+      "rotation_period_hours": 15.2,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer ice dwarf; trans-neptunian analog; entirely unsurveyed"
+    },
+    {
+      "body_id": "GJ807h",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 8,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.05,
+      "orbital_period_days": 48000.0,
+      "rotation_period_hours": 12.6,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "distant ice dwarf; scattered disk; entirely unsurveyed"
+    },
+    {
+      "body_id": "GJ807i",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 9,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.04,
+      "orbital_period_days": 92000.0,
+      "rotation_period_hours": 11.0,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "extreme outer ice dwarf; detached scattered disk; unknown until outer system survey"
+    },
+    {
+      "body_id": "GJ807-oort",
+      "proper_name": null,
+      "body_type": "oort_cloud",
+      "orbit_index": 10,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": null,
+      "surface_gravity": null,
+      "orbital_period_days": null,
+      "rotation_period_hours": null,
+      "atmosphere": null,
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "oort cloud; gate infrastructure sited here"
+    }
+  ],
+  "stations": [
+    {
+      "station_id": "GJ807-oort-S1",
+      "proper_name": "Grenzstein Horizon",
+      "orbits_body_id": "GJ807-oort",
+      "station_type": "horizon",
+      "population": 400,
+      "economic_role": "transit",
+      "docking_class": "major",
+      "has_gate_infrastructure": true,
+      "notes": "two-aperture through-route horizon station; operated by small coordinating council caretaker team; connects Bout du Chemin inward and Yttermark outward; minimal permanent infrastructure for a 40-year settlement — functional but not established; community administrative reporting routed through Bout du Chemin's channel (Grenzstein's admin office has two staff, uses Bout du Chemin as proxy for Assembly reporting requirements)"
+    }
+  ]
+}
diff --git a/wiki/star-systems/GJ-807/index.md b/wiki/star-systems/GJ-807/index.md
index f667ec223..eb78fbcd5 100644
--- a/wiki/star-systems/GJ-807/index.md
+++ b/wiki/star-systems/GJ-807/index.md
@@ -48,6 +48,31 @@ A forty-year-old settlement found structured geological anomalies in its first s
 
 G-type header per the database classification. The READ-ONLY profile shows K0IV — a subgiant K-type, slightly evolved off the main sequence. The "G-type" header classification reflects the database grouping rather than the precise spectral type; a K0IV is at the warm end of the K range and could be grouped either way depending on classification convention. Wave_5 at hop 16 is at the current settlement frontier — this is one of the newest settled systems in the west_reach corridor. Through-route topology with two apertures: Bout du Chemin inward, Yttermark (GJ 529) outward.
 
+## Celestial Bodies
+<!-- READ-ONLY — generated from systems.db bodies/stations tables -->
+
+| Orbit | ID | Name | Type | Inhabited | Pop | Mass | Gravity | Year (d) | Day (h) | Atmo | Biome | Hydro | Economy | Settlement | Industrial |
+|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+| 1 | `GJ807b` | — | planet | no | — | terrestrial | 0.71g | 130 | 3120.0 | none | barren | — | — | — | — |
+| 2 | `GJ807c` | — | planet | no | — | terrestrial | 0.66g | 295 | 22.4 | thick | arid | — | — | — | — |
+| 3 | `GJ807d` | Pierrevert | planet | yes | 8K | terrestrial | 0.91g | 620 | 27.6 | breathable | temperate-cool | rivers-lakes | agricultural | concentrated | west_reach |
+| ↳ 3.1 | `GJ807d-1` | — | moon | no | — | dwarf | 0.07g | 25 | 595.2 | none | barren | — | — | — | — |
+| 4 | `GJ807-belt` | — | asteroid_belt | no | — | — | — | — | — | — | — | — | — | — | — |
+| 5 | `GJ807e` | — | gas_giant | no | — | gas_giant | 2.60g | 3500 | 9.8 | hydrogen-helium | — | — | — | — | — |
+| ↳ 5.1 | `GJ807e-1` | — | moon | no | — | dwarf | 0.10g | 14 | 345.6 | none | barren | — | — | — | — |
+| ↳ 5.2 | `GJ807e-2` | — | moon | no | — | dwarf | 0.07g | 32 | 758.4 | none | ice | — | — | — | — |
+| 6 | `GJ807f` | — | planet | no | — | terrestrial | 0.46g | 9200 | 19.4 | none | frozen | — | — | — | — |
+| 7 | `GJ807g` | — | planet | no | — | dwarf | 0.08g | 22000 | 15.2 | none | frozen | — | — | — | — |
+| 8 | `GJ807h` | — | planet | no | — | dwarf | 0.05g | 48000 | 12.6 | none | frozen | — | — | — | — |
+| 9 | `GJ807i` | — | planet | no | — | dwarf | 0.04g | 92000 | 11.0 | none | frozen | — | — | — | — |
+| 10 | `GJ807-oort` | — | oort_cloud | no | — | — | — | — | — | — | — | — | — | — | — |
+
+### Stations & Facilities
+
+| ID | Name | Type | Orbits | Population | Economy | Governance | Docking | Gate | Districts |
+|---|---|---|---|---|---|---|---|---|---|
+| `GJ807-oort-S1` | Grenzstein Horizon | horizon | `GJ807-oort` | 400 | transit | — | major | yes | 1 |
+
 ## Topology
 <!-- READ-ONLY — regenerated from star-map.json edges -->
 - **Hop Distance from Gateway:** 16