diff --git a/docs/aerodromes/Class-D/.pages b/docs/aerodromes/Class-D/.pages
index 72c5dd95..524ed2da 100644
--- a/docs/aerodromes/Class-D/.pages
+++ b/docs/aerodromes/Class-D/.pages
@@ -5,5 +5,4 @@
title: Class D
nav:
- - Overview: index.md
- ...
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZPM/.pages b/docs/aerodromes/Class-D/NZPM/.pages
deleted file mode 100644
index 62a940c0..00000000
--- a/docs/aerodromes/Class-D/NZPM/.pages
+++ /dev/null
@@ -1,4 +0,0 @@
-title: NZPM - Palmerston North
-nav:
- - Aerodrome Overview: index.md
- - ...
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZPM/arrivals.md b/docs/aerodromes/Class-D/NZPM/arrivals.md
deleted file mode 100644
index 1058f1b9..00000000
--- a/docs/aerodromes/Class-D/NZPM/arrivals.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
- title: Arrivals
----
-
---8<-- "includes/abbreviation"
diff --git a/docs/aerodromes/Class-D/NZPM/departures.md b/docs/aerodromes/Class-D/NZPM/departures.md
deleted file mode 100644
index ff8f7b03..00000000
--- a/docs/aerodromes/Class-D/NZPM/departures.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
- title: Departures
----
-
---8<-- "includes/abbreviation"
diff --git a/docs/aerodromes/Class-D/NZPM/index.md b/docs/aerodromes/Class-D/NZPM/index.md
deleted file mode 100644
index e83836a5..00000000
--- a/docs/aerodromes/Class-D/NZPM/index.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
- title: Overview
----
-
---8<-- "includes/abbreviations.md"
-
-## Control Positions and Navaids
-
-| Position Name | Callsign | Frequency | Usage |
-| ----------------- | --------- | ----------- | ---------- |
-| D-ATIS | NZPM_ATIS | 129.700 MHz | ATIS |
-| Palmerston Ground | NZPM_GND | 121.700 MHz | Event Only |
-| Palmerston Tower | NZPM_TWR | 120.600 MHz | Primary |
-| Ohakea Approach | NZOH_APP | 125.100 MHz | Primary |
-
-
-
-## Aerodrome Usage
-
-Purpose of the aerodrome, typical traffic patterns, typical aircraft, unusual things about the AD (weird approaches, weird airspace, etc)
-
-### Aerodrome Layout
-
-#### Runways
-
-Information about runway restrictions, etc
-
-#### Taxiways
-
-Taxiway restrictions, normal taxi
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZPM/vfr-procedures.md b/docs/aerodromes/Class-D/NZPM/vfr-procedures.md
deleted file mode 100644
index 720b54fc..00000000
--- a/docs/aerodromes/Class-D/NZPM/vfr-procedures.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
- title: VFR Procedures
----
-
---8<-- "includes/abbreviation"
-
-## Title
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZTG/.pages b/docs/aerodromes/Class-D/NZTG/.pages
deleted file mode 100644
index f9686dc0..00000000
--- a/docs/aerodromes/Class-D/NZTG/.pages
+++ /dev/null
@@ -1,4 +0,0 @@
-title: NZTG - Tauranga
-nav:
- - index.md
- - ...
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZTG/arrivals.md b/docs/aerodromes/Class-D/NZTG/arrivals.md
deleted file mode 100644
index 810212f5..00000000
--- a/docs/aerodromes/Class-D/NZTG/arrivals.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
- title: Arrivals
----
-
---8<-- "includes/abbreviations.md"
-
-## Standard Terminal Arrivals
-
-
-
-### Runway 07
-
-#### STARs
-
-| Arrival Direction | Transition Fix | STAR | Notes |
-| ----------------- | -------------- | -------- | --------------------------------------------------- |
-| NW | BIKOT | BIKOT 1A | Light IFR |
-| NW | URBUX | URBUX 1A | Auckland arrivals |
-| W | OLDON | OLDON 1A | Hamilton arrivals |
-| SW | FALLS | FALLS 1A | Wellington arrivals when `OROPI` route is congested |
-| SE | GOBUK | GOBUK 1A | Any eastern arrivals |
-| S | OROPI | OROPI 1A | Wellington or Christchurch arrivals |
-| E | PIBOV | PIBOV 1A | Eastern arrivals from Whakatane or Gisbourne |
-
-### Approaches
-
-All arrivals terminate at `RUSTA` or `MORTA`, which are the IAF for the RNAV approach.
-
-If aircraft are visual they can report "Callsign, IAF, inbound, visual RNAV 07". It is then up to the Controllers discretion whether the aircraft is cleared visual or not.
-
-### Missed Approach
-
-In the event of a missed approach, aicraft should be instructed to carry out the published missed approach procedure. This will have the aircraft climbing to 2000 feet, turning left direct to `LETGU`, before holding at `RUSTA` 5000 feet or above. Aircrft can then be re-cleared for the RNAV approach, or cleared a visual approach, should the conditions be suitable.
-
-## Runway 25
-
-#### STARs
-
-| Arrival Direction | Transition Fix | STAR | Notes |
-| ----------------- | -------------- | -------- | --------------------------------------------------- |
-| NW | BIKOT | BIKOT 1B | Light IFR |
-| NW | URBUX | URBUX 1B | Auckland arrivals |
-| W | OLDON | OLDON 1B | Hamilton arrivals |
-| SW | FALLS | FALLS 1B | Wellington arrivals when `OROPI` Route is congested |
-| SE | GOBUK | GOBUK 1B | Any eastern arrivals |
-| S | OROPI | OROPI 1B | Wellington or Christchurch arrivals |
-| E | PIBOV | PIBOV 1B | Eastern arrivals from Whakatane or Gisbourne |
-
-### Approaches
-
-All arrivals terminate at `UBSET ` or `TODAN`, which are the IAF for the RNAV approach.
-
-If aircraft are visual they can report "Callsign, IAF, inbound, visual RNAV 25". It is then up to the Controllers discretion whether the aircraft is cleared visual or not.
-
-### Missed Approach
-
-In the event of a missed approach, aicraft should be instructed to carry out the published missed approach procedure. This will have the aircraft climbing to 2000 feet, turning right direct to `LETGU`, before holding at `UBSET` at 4000 feet or above. Aircrft can then be re-cleared for the RNAV approach, or cleared a visual approach, should the conditions be suitable.
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZTG/departures.md b/docs/aerodromes/Class-D/NZTG/departures.md
deleted file mode 100644
index a7d807a7..00000000
--- a/docs/aerodromes/Class-D/NZTG/departures.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
- title: Departures
----
-
---8<-- "includes/abbreviations.md"
-
-## Procedure Assignment
-
-Our Controller Clients will usually assign the most suitable departure for that aircraft's flight plan, although is is important to understand the Departures and their typical assignment rules.
-
-### Runway 07
-
-#### SIDs
-
-
-| Departure Direction | SID | Transition | Notes |
-| ------------------- | -------- | --------------------------------------- | --------------------------------------------------------------------------------- |
-| NW | UBSET 2P | `NOBAR` | Auckland or Northland bound aircraft |
-| SE | TODAN 2P | `OLDON` `FALLS` `ODOLO` `GOBUK` `PIBOV` | Wellington or Chrishchurch traffic - occasionally Hamilton. |
-| W | BELET 3 | `DOTAR` | Non-RNAV departure. Typically issued to GA IFR, due to not being fitted for GNSS. |
-
-
-### Runway 25
-
-#### SIDs
-
-| Departure Direction | SID | Transition | Notes |
-| ------------------- | -------- | --------------------------------------- | --------------------------------------------------------------------------------- |
-| NW | RUSTR 2R | `NOBAR` | Auckland or Northland bound aircraft |
-| S | MORTA 2R | `OLDON` `FALLS` `ODOLO` `GOBUK` `PIBOV` | Wellington or Chrishchurch traffic - occasionally Hamilton. |
-| W | DOTAR 3 | `DOTAR` | Non-RNAV departure. Typically issued to GA IFR, due to not being fitted for GNSS. |
-
-### Visual Departures
-
-!!! info
- Visual departures are almost never given in Tauranga, due to the SID being cancelled early by Bay Approach. Most aircraft will typically be cleared direct the transition fix, traffic depending.
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZTG/index.md b/docs/aerodromes/Class-D/NZTG/index.md
deleted file mode 100644
index c3fce11b..00000000
--- a/docs/aerodromes/Class-D/NZTG/index.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
- title: General Notes
----
-
---8<-- "includes/abbreviations.md"
-
-## Control Positions and Navaids
-
-| Position Name | Callsign | Usage |
-| -------------- | ---------- | ------- |
-| Bay Approach | NZCH-B_CTR | Primary |
-| Tauranga Tower | NZTG_TWR | Primary |
-| D-ATIS | NZTG_ATIS | ATIS |
-
-
-## Usage
-
-Tauranga Airport is a small class D regional sirport located 2km east of Tauranga City. Tauranga can accomodate up to an A320, but usually serves Air New Zealand's turboprop fleet. Tauranga also receives regular visits from the Air Chathams fleet of aircraft, serving as a fuel stop betwen mainland New Zealand and the Chatham Islands.
-
-## Layout
-
-Tauranga has four gates on the main apron and is home to over 20 private hangars. Tauranga also hosts multiple flight training organisations, which provides training for fixed wing, helicopter and gliders.
-
-Tauranga has six Runways in total. While only four are regularly used, the remainder are used when required or when special operations are in place.
-
-
-### Runways
-
-| Runway Designator | Length (m) | Type |
-| ----------------- | ---------- | ---------- |
-| 07 - 25 | 1825 | Bituminous |
-| 07 - 25 | 750 | Grass |
-| 04 - 22 | 640 | Grass |
-| 16 - 34 | 575 | Grass |
-
-Sealed 07/25 is always issued to aircraft with a gross weight of 5500kg or more, and can be issued to smaller aircraft on request. Gliders & helicopters are not permitted to use the sealed runway.
-
-Grass 25/07 is always issued to light aircraft with a gross weight of 5500kg or less and cannot be issued to Category B/C/D aircraft.
-
-!!! info "Grass 04/22 Glider Operations Only"
- The Airport Company has an agreement with the Gliding Club prohibiting use of Grass 04/22 for aircraft other than gliders and tow planes.
-
-!!! info "Parallel Runway Operations"
- Simultaneous parallel operations on sealed and grass runways 07/25 are permitted only for aircraft 2300 kg or less in VFR conditions and when ATC is on duty.
-
-
-### Use of Taxiways and Holding Points
-
-Taxiway E runs parallel to Grass 07/25, for almost the entire length of the apron area.
-
-Upon landing, inbound aircraft shall be told to either taxi to the apron or hold short of the grass due to departing/arriving traffic. If the latter has to occur, the aircraft must be instructed to taxi to A1/A2 and hold short of Grass 07/25.
-
-#### Grass Hold Short Points
-
-There are various intermediate holding points specifically for the grass runways. Usually, these hold short points are located on hard-standing surfaces.
-
-- Grass 07 - Golf
-
-- Grass 25 - Foxtrot
-
-- Grass 16 - W4 from the apron side, or W3 from the Sealed 07 threshold side.
-
-#### Sealed Hold Short Points
-
-- Sealed 07/25 (from the Main Apron) - A2 or A3
-
-- Sealed 07 (light aircraft) - W1 or W2
-
-- Sealed 25 (light aircraft) - E1 or E2
-
-!!! info
- When grass 04/22 is in use, aircraft using Taxiway W should hold short at W2 to prevent an incursion.
-
-
-## General Rules of Thumb
-
-### Movement Areas
-
-Aircraft should contact ATC before entering the movement area and should state their location after contact has been established.
-
-Aircraft who require taxi to the fuel pumps from any of the eastern hangars or Aero Club can do so without contacting ATC, provided they stay outside the Movement Area - as indicated by a dashed red line along Taxiway E.
-
-### Parallel Operations
-
-If both the sealed and grass runways are occupied, and both aircraft are ready for departure, the aircraft on the grass runway should be instructed to takeoff first. This avoids the need to wait two or three minutes due to wake turbulence separation. The aircraft who departs first should be instructed to make an early turn to allow successive departure of the waiting aircraft.
-
-### Crane Operation
-
-!!! danger
- Tauranga Port is Adjacent to Tauranga Airport and operates Multiple cranes up to 361 ft AMSL at 1.5 to 2.0 NM from Runway 07 Threshold.
-
- VFR Aircraft tracking Hunters Creek or Mt. Harbour Entrance should not commence their turn until 500ft AGL.
\ No newline at end of file
diff --git a/docs/aerodromes/Class-D/NZTG/vfr-procedures.md b/docs/aerodromes/Class-D/NZTG/vfr-procedures.md
deleted file mode 100644
index eba2e5f2..00000000
--- a/docs/aerodromes/Class-D/NZTG/vfr-procedures.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
- title: VFR Procedures
----
-
---8<-- "includes/abbreviation"
-
-### Rule Of Thumb
-
-All arriving aircraft should keep seawards of the coastline, allowing for departing aircraft to pass on the land-side of the coast. This general rule is a safe way to keep traffic flowing efficiently in and out of the aerodrome.
-
-
-### Arrivals
-
-All arriving VFR aircraft should reference the preferred VFR arrival procedures [as listed in the NZ AIP](https://www.aip.net.nz/assets/AIP/Aerodrome-Charts/Tauranga-NZTG/NZTG_35.1_35.2.pdf){ target=blank }.
-
-These standard VFR departures should be issued where possible, to ensure the safe and efficient flow of traffic is maintained.
-
-### VFR Departures
-
-| Procedure Name | Direction | Runway |
-| ----------------------- | --------- | ------ |
-| Hunters Creek Departure | SW | 25 |
-| Hospital Departure | S | 25 |
-| Te Puke Departure | E | 25 |
-| Main Beach Departure | W | 07 |
-| East Departure | E | 07 |
-| Baldy Departure | W | 07 |
-
-
-All departure traffic should be advised to remain 1500 feet or below, unless otherwise stated on the departure plate.
-
-#### Standard Overhead Join
-
-With permission from Tauranga Tower, traffic are permitted to conduct a standard overhead join, typically beginning from the East or West.
-
diff --git a/docs/aerodromes/Class-D/assets/nzpm-airspace.png b/docs/aerodromes/Class-D/assets/nzpm-airspace.png
new file mode 100644
index 00000000..008f50b9
Binary files /dev/null and b/docs/aerodromes/Class-D/assets/nzpm-airspace.png differ
diff --git a/docs/aerodromes/Class-D/assets/nzpm-resp.png b/docs/aerodromes/Class-D/assets/nzpm-resp.png
new file mode 100644
index 00000000..11f96779
Binary files /dev/null and b/docs/aerodromes/Class-D/assets/nzpm-resp.png differ
diff --git a/docs/aerodromes/Class-D/index.md b/docs/aerodromes/Class-D/index.md
deleted file mode 100644
index d25fa4ec..00000000
--- a/docs/aerodromes/Class-D/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- title: Class D
-
----
-
---8<-- "includes/abbreviations.md"
-
-
diff --git a/docs/aerodromes/Class-D/nzpm.md b/docs/aerodromes/Class-D/nzpm.md
new file mode 100644
index 00000000..53cddd14
--- /dev/null
+++ b/docs/aerodromes/Class-D/nzpm.md
@@ -0,0 +1,67 @@
+---
+title: NZPM - Palmerston North
+---
+
+--8<-- "includes/abbreviations.md"
+
+# NZPM - Palmerston North
+
+| Position | Callsign | Frequency | Login | Type |
+| -------------- | ----------------- | --------- | -------- | --------- |
+| Palmerston ADC | Palmerston Tower | 120.6 | NZPM_TWR | Primary |
+| Palmerston SMC | Palmerston Ground | 121.7 | NZPM_GND | Secondary |
+
+## Areas of Responsibility
+
+The areas of responsibility are as depicted below. The areas of Taxiways `B`, `C` and `D` that fall under Tower's responsibility only apply if Grass 07/25 is in use. If not in use, this area shall be delegated to Ground.
+
+If Grass 07/25 is in use, aircraft taxiing for the sealed must be handed off at the `B3`, `C3` or `D3` holds.
+
+Tower shall hand off all aircraft once clear of the sealed runway. If the grass runway is in use, they shall be handed to Ground when passing `B3`, `C3` or `D3`.
+
+
+ 
+ Palmerston North Areas of Responsibility
+
+
+## Taxiways
+
+Taxiways `D` and `H` are only suitable for light GA aircraft. B733 and B734 to use Taxiway `C` to transit between `RWY 07/25` and stand 7. A320 and B738 aircraft restricted to Taxiway `B` when transiting between RWY 07/25 and main apron.
+
+All other traffic shall enter the runway closest to the take-off roll position. For example, if Runway 25 is active, aircraft should be instructed to enter the runway via Taxiway `B`.
+
+## Airspace
+
+The Palmerston North CTR follows the lateral boundaries as shown below from `SFC` to `A015`, and is designated as `Class D` airspace.
+
+
+ 
+ Palmerston North Control Zone (CTR)
+
+
+## SIDs and STARs
+
+Due to the surrounding MOAs, NZPM has numerous SIDs and STARs to either reroute traffic around, or climb aircraft above, the active MOAs. These limitations only apply to aircraft arriving from and departing to the North.
+
+### Runway 07
+
+The preferred departure for IFR aircraft tracking via `OMBUB` is the `TEROT #Q`, due to the relatively direct nature. For other departure directions, issue the suggested SID.
+
+The below table outlines the prohibited procedures when the respective MOA is active.
+
+| Active MOA(s) | MOA Vertical Limits | Prohibited SIDs | Prohibited STARs | Reasoning |
+| ------------- | ------------------- | -------------------------------- | ---------------- | -------------------------------- |
+| M311 - Bulls | `A015` - `A025` | None | `BUVLI #B` | STAR descends through active MOA |
+| M307 - Marton | `A080` - `FL200` | `RUXOS #S` `DADLI #S` `TEROT #Q` | None | SIDs climbs through active MOA |
+
+
+### Runway 25
+
+The preferred departure for IFR aircraft tracking via `OMBUB` is the `GUTNI #R`, due to the relatively direct nature. For other departure directions, issue the suggested SID.
+
+The below table outlines the prohibited procedures when the respective MOA is active.
+
+| Active MOA(s) | MOA Vertical Limits | Prohibited SIDs | Prohibited STARs | Reasoning |
+| ------------- | ------------------- | --------------- | ---------------- | ----------------------------- |
+| M311 - Bulls | `A015` - `A025` | `GUTNI #R` | None | SID climbs through active MOA |
+| M307 - Marton | `A080` - `FL200` | `GUTNI #R` | None | SID climbs through active MOA |