diff --git a/src/autorouter/ratsnest.rs b/src/autorouter/ratsnest.rs
index 2549158..12f3f27 100644
--- a/src/autorouter/ratsnest.rs
+++ b/src/autorouter/ratsnest.rs
@@ -89,7 +89,7 @@ impl Ratsnest {
             for node in layout.drawing().layer_primitive_nodes(layer) {
                 match node {
                     PrimitiveIndex::FixedDot(dot) => {
-                        if layout.compounds(dot).next().is_none() {
+                        if layout.zones(dot).next().is_none() {
                             if let Some(net) = layout.drawing().primitive(dot).maybe_net() {
                                 if !triangulations.contains_key(&(layer, net)) {
                                     triangulations.insert(
diff --git a/src/dsn/design.rs b/src/dsn/design.rs
index fe08960..f3acc47 100644
--- a/src/dsn/design.rs
+++ b/src/dsn/design.rs
@@ -106,6 +106,7 @@ impl DsnDesign {
                                     circle.diameter as f64 / 2.0,
                                     layer as u64,
                                     *net_id,
+                                    Some(pin_name.clone()),
                                 )
                             }
                             Shape::Rect(rect) => {
@@ -127,6 +128,7 @@ impl DsnDesign {
                                     rect.y2 as f64,
                                     layer as u64,
                                     *net_id,
+                                    Some(pin_name.clone()),
                                 )
                             }
                             Shape::Path(path) => {
@@ -146,6 +148,7 @@ impl DsnDesign {
                                     path.width as f64,
                                     layer as u64,
                                     *net_id,
+                                    Some(pin_name.clone()),
                                 )
                             }
                             Shape::Polygon(polygon) => {
@@ -165,6 +168,7 @@ impl DsnDesign {
                                     polygon.width as f64,
                                     layer as u64,
                                     *net_id,
+                                    Some(pin_name.clone()),
                                 )
                             }
                         };
@@ -203,6 +207,7 @@ impl DsnDesign {
                             circle.diameter as f64 / 2.0,
                             layer as u64,
                             net_id,
+                            None,
                         )
                     }
                     Shape::Rect(rect) => {
@@ -224,6 +229,7 @@ impl DsnDesign {
                             rect.y2 as f64,
                             layer as u64,
                             net_id,
+                            None,
                         )
                     }
                     Shape::Path(path) => {
@@ -243,6 +249,7 @@ impl DsnDesign {
                             path.width as f64,
                             layer as u64,
                             net_id,
+                            None,
                         )
                     }
                     Shape::Polygon(polygon) => {
@@ -262,6 +269,7 @@ impl DsnDesign {
                             polygon.width as f64,
                             layer as u64,
                             net_id,
+                            None,
                         )
                     }
                 };
@@ -287,6 +295,7 @@ impl DsnDesign {
                 wire.path.width as f64,
                 layer_id as u64,
                 net_id,
+                None,
             );
         }
 
@@ -317,6 +326,7 @@ impl DsnDesign {
         r: f64,
         layer: u64,
         net: usize,
+        maybe_pin: Option<String>,
     ) {
         let circle = Circle {
             pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, 0.0, 0.0),
@@ -324,11 +334,14 @@ impl DsnDesign {
         };
 
         layout
-            .add_fixed_dot(FixedDotWeight {
-                circle,
-                layer,
-                maybe_net: Some(net),
-            })
+            .add_fixed_dot(
+                FixedDotWeight {
+                    circle,
+                    layer,
+                    maybe_net: Some(net),
+                },
+                maybe_pin.clone(),
+            )
             .unwrap();
     }
 
@@ -344,13 +357,15 @@ impl DsnDesign {
         y2: f64,
         layer: u64,
         net: usize,
+        maybe_pin: Option<String>,
     ) {
-        let zone = layout.add_compound(
+        let zone = layout.add_zone(
             SolidZoneWeight {
                 layer,
                 maybe_net: Some(net),
             }
             .into(),
+            maybe_pin.clone(),
         );
 
         // Corners.
@@ -467,6 +482,7 @@ impl DsnDesign {
         width: f64,
         layer: u64,
         net: usize,
+        maybe_pin: Option<String>,
     ) {
         // add the first coordinate in the wire path as a dot and save its index
         let mut prev_pos = Self::pos(
@@ -478,14 +494,17 @@ impl DsnDesign {
             coords[0].y as f64,
         );
         let mut prev_index = layout
-            .add_fixed_dot(FixedDotWeight {
-                circle: Circle {
-                    pos: prev_pos,
-                    r: width / 2.0,
+            .add_fixed_dot(
+                FixedDotWeight {
+                    circle: Circle {
+                        pos: prev_pos,
+                        r: width / 2.0,
+                    },
+                    layer,
+                    maybe_net: Some(net),
                 },
-                layer,
-                maybe_net: Some(net),
-            })
+                maybe_pin.clone(),
+            )
             .unwrap();
 
         // iterate through path coords starting from the second
@@ -504,14 +523,17 @@ impl DsnDesign {
             }
 
             let index = layout
-                .add_fixed_dot(FixedDotWeight {
-                    circle: Circle {
-                        pos,
-                        r: width / 2.0,
+                .add_fixed_dot(
+                    FixedDotWeight {
+                        circle: Circle {
+                            pos,
+                            r: width / 2.0,
+                        },
+                        layer,
+                        maybe_net: Some(net),
                     },
-                    layer,
-                    maybe_net: Some(net),
-                })
+                    maybe_pin.clone(),
+                )
                 .unwrap();
 
             // add a seg between the current and previous coords
@@ -524,6 +546,7 @@ impl DsnDesign {
                         layer,
                         maybe_net: Some(net),
                     },
+                    maybe_pin.clone(),
                 )
                 .unwrap();
 
@@ -542,13 +565,15 @@ impl DsnDesign {
         width: f64,
         layer: u64,
         net: usize,
+        maybe_pin: Option<String>,
     ) {
-        let zone = layout.add_compound(
+        let zone = layout.add_zone(
             SolidZoneWeight {
                 layer,
                 maybe_net: Some(net),
             }
             .into(),
+            maybe_pin.clone(),
         );
 
         // add the first coordinate in the wire path as a dot and save its index
diff --git a/src/layout/layout.rs b/src/layout/layout.rs
index 0ddbcb0..bea5ae3 100644
--- a/src/layout/layout.rs
+++ b/src/layout/layout.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use geo::Point;
 use petgraph::stable_graph::StableDiGraph;
 use rstar::AABB;
@@ -31,11 +33,15 @@ pub type NodeIndex = GenericNode<PrimitiveIndex, GenericIndex<ZoneWeight>>;
 #[derive(Debug)]
 pub struct Layout<R: RulesTrait> {
     drawing: Drawing<ZoneWeight, R>,
+    node_to_pin: HashMap<NodeIndex, String>,
 }
 
 impl<R: RulesTrait> Layout<R> {
     pub fn new(drawing: Drawing<ZoneWeight, R>) -> Self {
-        Self { drawing }
+        Self {
+            drawing,
+            node_to_pin: HashMap::new(),
+        }
     }
 
     pub fn remove_band(&mut self, band: BandIndex) {
@@ -59,8 +65,19 @@ impl<R: RulesTrait> Layout<R> {
             .insert_segbend(from, around, dot_weight, seg_weight, bend_weight, cw)
     }
 
-    pub fn add_fixed_dot(&mut self, weight: FixedDotWeight) -> Result<FixedDotIndex, Infringement> {
-        self.drawing.add_fixed_dot(weight)
+    pub fn add_fixed_dot(
+        &mut self,
+        weight: FixedDotWeight,
+        maybe_pin: Option<String>,
+    ) -> Result<FixedDotIndex, Infringement> {
+        let dot = self.drawing.add_fixed_dot(weight)?;
+
+        if let Some(pin) = maybe_pin {
+            self.node_to_pin
+                .insert(GenericNode::Primitive(dot.into()), pin);
+        }
+
+        Ok(dot)
     }
 
     pub fn add_zone_fixed_dot(
@@ -68,6 +85,7 @@ impl<R: RulesTrait> Layout<R> {
         weight: FixedDotWeight,
         zone: GenericIndex<ZoneWeight>,
     ) -> Result<FixedDotIndex, Infringement> {
+        let pin = self.node_to_pin.get(&GenericNode::Compound(zone));
         let maybe_dot = self.drawing.add_fixed_dot(weight);
 
         if let Ok(dot) = maybe_dot {
@@ -82,8 +100,16 @@ impl<R: RulesTrait> Layout<R> {
         from: FixedDotIndex,
         to: FixedDotIndex,
         weight: FixedSegWeight,
+        maybe_pin: Option<String>,
     ) -> Result<FixedSegIndex, Infringement> {
-        self.drawing.add_fixed_seg(from, to, weight)
+        let seg = self.drawing.add_fixed_seg(from, to, weight)?;
+
+        if let Some(pin) = maybe_pin {
+            self.node_to_pin
+                .insert(GenericNode::Primitive(seg.into()), pin);
+        }
+
+        Ok(seg)
     }
 
     pub fn add_zone_fixed_seg(
@@ -93,7 +119,8 @@ impl<R: RulesTrait> Layout<R> {
         weight: FixedSegWeight,
         zone: GenericIndex<ZoneWeight>,
     ) -> Result<FixedSegIndex, Infringement> {
-        let maybe_seg = self.add_fixed_seg(from, to, weight);
+        let pin = self.node_to_pin.get(&GenericNode::Compound(zone));
+        let maybe_seg = self.add_fixed_seg(from, to, weight, pin.cloned());
 
         if let Ok(seg) = maybe_seg {
             self.drawing.add_to_compound(seg, zone);
@@ -124,6 +151,28 @@ impl<R: RulesTrait> Layout<R> {
         self.drawing.move_dot(dot, to)
     }
 
+    pub fn add_zone(
+        &mut self,
+        weight: ZoneWeight,
+        maybe_pin: Option<String>,
+    ) -> GenericIndex<ZoneWeight> {
+        let zone = self.drawing.add_compound(weight);
+
+        if let Some(pin) = maybe_pin {
+            self.node_to_pin
+                .insert(GenericNode::Compound(zone.into()), pin);
+        }
+
+        zone
+    }
+
+    pub fn zones<W: 'static>(
+        &self,
+        node: GenericIndex<W>,
+    ) -> impl Iterator<Item = GenericIndex<ZoneWeight>> + '_ {
+        self.drawing.compounds(node)
+    }
+
     pub fn band_length(&self, face: DotIndex) -> f64 {
         // TODO.
         0.0
@@ -195,7 +244,7 @@ impl<R: RulesTrait> Layout<R> {
     }
 }
 
-impl<R: RulesTrait> CompoundManagerTrait<ZoneWeight, GenericIndex<ZoneWeight>> for Layout<R> {
+/*impl<R: RulesTrait> CompoundManagerTrait<ZoneWeight, GenericIndex<ZoneWeight>> for Layout<R> {
     fn add_compound(&mut self, weight: ZoneWeight) -> GenericIndex<ZoneWeight> {
         self.drawing.add_compound(weight)
     }
@@ -222,4 +271,4 @@ impl<R: RulesTrait> CompoundManagerTrait<ZoneWeight, GenericIndex<ZoneWeight>> f
     ) -> impl Iterator<Item = GenericIndex<ZoneWeight>> {
         self.drawing.compounds(node)
     }
-}
+}*/