diff --git a/.agents/icao-reference.md b/.agents/icao-reference.md
new file mode 100644
index 00000000..eb8cf2fa
--- /dev/null
+++ b/.agents/icao-reference.md
@@ -0,0 +1,220 @@
+# NZ Aerodrome ICAO Reference (AI-only)
+
+This file is intended for internal AI-agent use only. It is not part of the public documentation.
+
+Use the list below as the canonical source for New Zealand aerodrome and heliport ICAO codes from `AD_1.03.pdf`.
+
+| ICAO | Aerodrome |
+| ---- | ---------- |
+| NZLX | Alexandra |
+| NZAN | Anama |
+| NZAR | Ardmore |
+| NZAS | Ashburton |
+| NZAM | Ashburton Medical Centre |
+| NZAA | Auckland |
+| NZAW | Auckland Harbour |
+| NZJL | Auckland Hospital |
+| NZBA | Balclutha |
+| NZJI | Bay of Islands Hospital |
+| NZBG | Bulls Gorge |
+| NZBW | Burwood Hospital |
+| NZCG | Centennial Park |
+| NZCB | Centre Bush |
+| NZCI | Chatham Islands/Tuuta |
+| NZCV | Cheviot |
+| NZCH | Christchurch |
+| NZJC | Christchurch Hospital |
+| NZJJ | Christchurch Hospital Hagley |
+| NZCL | Cloudy Bay |
+| NZCX | Coromandel |
+| NZCW | Cromwell |
+| NZCS | Cromwell Racecourse |
+| NZDV | Dannevirke |
+| NZDA | Dargaville |
+| NZJE | Dargaville Hospital |
+| NZDY | Drury |
+| NZDN | Dunedin |
+| NZDC | Dunedin City |
+| NZDH | Dunedin Hospital |
+| NZDU | Dunstan Hospital |
+| NZEV | Eves Valley |
+| NZFI | Feilding |
+| NZFG | Fern Gully |
+| NZFE | Fernside Fields |
+| NZFT | Flat Point |
+| NZFF | Forest Field |
+| NZFH | Fox |
+| NZFO | Fox Glacier |
+| NZFR | Fox River |
+| NZFP | Foxpine |
+| NZFJ | Franz Josef |
+| NZGA | Galatea |
+| NZGD | Geraldine |
+| NZGS | Gisborne |
+| NZJG | Gisborne Hospital |
+| NZGH | Glacier Country |
+| NZGY | Glenorchy |
+| NZGT | Glentanner |
+| NZGC | Gore |
+| NZGO | Gore Hospital |
+| NZGB | Great Barrier |
+| NZGM | Greymouth |
+| NZHT | Haast |
+| NZHN | Hamilton |
+| NZHM | Hanmer |
+| NZHR | Hanmer Medical Centre |
+| NZHS | Hastings |
+| NZJH | Hastings Hospital |
+| NZHA | Hawera |
+| NZHK | Hokitika |
+| NZHF | Huka Falls |
+| NZNV | Invercargill |
+| NZKO | Kaikohe |
+| NZKI | Kaikoura |
+| NZKJ | Kaikoura Beachfront |
+| NZKC | Kaikoura Medical Centre |
+| NZKF | Kaipara Flats |
+| NZKT | Kaitaia |
+| NZJK | Kaitaia Hospital |
+| NZKM | Karamea |
+| NZWE | Kauaroa Bay |
+| NZKH | Kenepuru Hospital |
+| NZKN | Kensington Park |
+| NZKK | Kerikeri/Bayof Islands |
+| NZKP | Koputaroa |
+| NZKY | Kowhai |
+| NZHP | Lake Haupiri |
+| NZLE | Lake Station/Nelson Lakes |
+| NZLA | Loburn Abbey |
+| NZLM | Lumsden Medical Centre |
+| NZMW | Makarora |
+| NZOG | Makarora Heliport |
+| NZVL | Mandeville |
+| NZSO | Marlborough Sounds |
+| NZMJ | Martins Bay |
+| NZMS | Masterton |
+| NZMA | Matamata |
+| NZMB | Mechanics Bay |
+| NZME | Mercer |
+| NZMV | Methven |
+| NZML | Mid Waiho Loop |
+| NZMM | Middlemore Hospital |
+| NZMF | Milford Sound |
+| NZMK | Motueka |
+| NZKD | Motu Kaikoura Island |
+| NZMC | Mount Cook |
+| NZMR | Murchison |
+| NZUR | Murchison Hospital |
+| NZNR | Napier |
+| NZNS | Nelson |
+| NZNH | Nelson Hospital |
+| NZNP | New Plymouth |
+| NZNF | Norfolk |
+| NZNE | North Shore |
+| NZJN | North Shore Hospital |
+| NZOU | Oamaru |
+| NZOR | Oamaru Hospital |
+| NZON | Oban |
+| NZOB | Ocean Beach |
+| NZOH | Ohakea |
+| NZOX | Okiwi Station |
+| NZOF | Omaha Flats |
+| NZOM | Omaka |
+| NZOA | Omarama |
+| NZOW | Onetangi |
+| NZOI | Ongaio Island |
+| NZOP | Opotiki |
+| NZOT | Otaki |
+| NZOS | Otehei Bay |
+| NZPS | Paihia Waterfront |
+| NZPM | Palmerston North |
+| NZJM | Palmerston North Hospital |
+| NZPW | Papawai |
+| NZPI | Parakai |
+| NZPP | Paraparaumu |
+| NZUN | Pauanui Beach |
+| NZPN | Picton |
+| NZPK | Pikes Point |
+| NZPO | Porangahau |
+| NZPH | Pudding Hill |
+| NZUK | Pukaki |
+| NZPU | Pukekohe |
+| NZQN | Queenstown |
+| NZQW | Queens Wharf |
+| NZRA | Raglan |
+| NZRI | Rakitata Island |
+| NZRN | Ranfurly Medical Centre |
+| NZRT | Rangiora |
+| NZRK | Rangitaiki |
+| NZRD | Rosedale |
+| NZRO | Rotorua |
+| NZJO | Rotorua Hospital |
+| NZLF | Rotorua Lakefront |
+| NZRL | Rotorua Lakes |
+| NZRX | Roxburgh |
+| NZRR | Ruatoria |
+| NZRW | Ruawai |
+| NZRC | Ryans Creek |
+| NZJS | Southland–Kew Hospital |
+| NZSF | Springfield |
+| NZSL | Springhill |
+| NZSD | Stratford |
+| NZAH | Taharoa Ironsands |
+| NZTI | Taieri |
+| NZVR | Taihape |
+| NZTK | Takaka |
+| NZTC | Tapanui Medical Centre |
+| NZJQ | Taranaki Base Hospital |
+| NZTS | Tasman |
+| NZTM | Taumarunui |
+| NZJT | Taumarunui Hospital |
+| NZAP | Taupo |
+| NZJZ | Taupo Hospital |
+| NZLT | Taupo Water |
+| NZTG | Tauranga |
+| NZJA | Tauranga Hospital |
+| NZTJ | Tawhaki |
+| NZTX | Te Anau Medical Centre |
+| NZMO | Te Anau/Manapouri |
+| NZTR | Te Araroa |
+| NZFA | Te Hapua |
+| NZTL | Tekapo |
+| NZTP | Tekapo/Mackenzie |
+| NZTE | Te Kowhai Airpark |
+| NZTT | Te Kuiti |
+| NZTQ | Te Kuiti Hospital |
+| NZJP | Te Puia Springs Hospital |
+| NZTH | Thames |
+| NZTU | Timaru |
+| NZTZ | Timaru Hospital |
+| NZTO | Tokoroa |
+| NZJX | Tokoroa Hospital |
+| NZTN | Turangi |
+| NZTW | Twizel Medical Centre |
+| NZKE | Waiheke |
+| NZWV | Waihi Beach |
+| NZHH | Waikato Hospital |
+| NZWM | Waimate |
+| NZYP | Waipukurau |
+| NZMH | Wairarapa Hospital |
+| NZJB | Wairau Hospital |
+| NZWO | Wairoa |
+| NZJY | Wairoa Hospital |
+| NZWQ | Waitiki |
+| NZWF | Wanaka |
+| NZHC | Wanaka Lakes Health Centre |
+| NZWZ | Warkworth |
+| NZWN | Wellington |
+| NZWH | Wellington Hospital |
+| NZWL | West Melton |
+| NZWS | Westport |
+| NZWK | Whakatane |
+| NZJF | Whakatane Hospital |
+| NZWU | Whanganui |
+| NZJU | Whanganui Hospital |
+| NZWR | Whangarei |
+| NZJR | Whangarei Hospital |
+| NZES | Wharepapa South |
+| NZWP | Whenuapai |
+| NZWT | Whitianga |
+| NZWB | Woodbourne |
diff --git a/AGENTS.md b/AGENTS.md
index 7dea79be..c36c8c01 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,6 +2,8 @@
 
 Use this file as a starting point for creating consistent AIRAC changelog entries in `docs/changelog/YYYY/XXXX.md`.
 
+For New Zealand aerodrome ICAO code to name mapping, use `.agents/icao-reference.md` as the canonical reference.
+
 ## Required structure
 
 ```md
@@ -44,6 +46,9 @@ Use this file as a starting point for creating consistent AIRAC changelog entrie
     - If the Type column contains `(AR)`, append ` (AR)` to the name (e.g. `RNP 30 (AR)`).
     - In practice: check the source Type field when drafting entries and only include `(AR)` when that field lists it.
 - All SIDs, STARs, or RNP approaches should be listed on the same line. When multiple procedures share the same reason, consolidate them under one bullet point with the common reason below (e.g., "The following SIDs have been amended: `NAME1`, `NAME2`. - Procedure reviewed."). For procedure-specific reasons, list them separately or append to the names (e.g., "`NAME1`, `NAME2`: minor track changes."). If no reason is given, no short note should be added.
+- SID and STAR entries should show the new name. If the initial waypoint part of the name (e.g. `SCARY` from `SCARY3D`) has changed, the procedure-specific reasons should list it as renamed and include the from name in the reason otherwise this is not necessary.
+- Rows whose Type is `Standard Route` are Standard Route changes and should be placed in the appropriate location. These should be listed as a bullet-point list. It should use the word amended rather than renamed.
+- All SID, STAR, RNP, ILS, and other procedure changes remain under `## Aerodrome`, even if they involve a rename.
 
 ## Example section labels
 
diff --git a/docs/changelog/2026/2608.md b/docs/changelog/2026/2608.md
new file mode 100644
index 00000000..2bfdde18
--- /dev/null
+++ b/docs/changelog/2026/2608.md
@@ -0,0 +1,122 @@
+---
+  title: Cycle 2608 (06 Aug)
+---
+
+--8<-- "includes/abbreviations.md"
+
+## Data Changes
+
+No significant changes.
+
+## Aerodrome
+
+### NZAR: Ardmore
+
+#### RWY 03
+
+- The following RNP procedure has been amended: `RNP 03`
+    - Waypoint `KINGS` changed to `SUGEM`.
+
+### NZAA: Auckland
+
+#### RWY 05R
+
+- The following STAR has been amended: `BASIV1B`
+    - Waypoint `BIGUL` changed to `AGTAN`.
+- The following STARs have been amended and renamed: `LEBIP1B`, `LEBIP1D`
+    - Previously `SCARY3B`, `SCARY3D`.
+    - Waypoint `SCARY` changed to `LEBIP`.
+
+#### RWY 23L
+
+- The following STAR has been amended: `EXOPI1A`
+    - Waypoint `STORK` changed to `OLRIK`.
+- The following STARs have been amended and renamed: `ARADI2N`, `TAZEY3N`, `DAVEE7A`, `TAZEY4E`, `DAVEE5E`
+    - Waypoint `ZORBA` changed to `AKDER`.
+- The following STARs have been amended and renamed: `DODKU2A`, `DODKU3E`
+    - Waypoint `TEVUC` changed to `APIPO`.
+- The following RNP approaches have been amended: `RNP V (AR)`, `RNP S (AR)`.
+    - `RNP V (AR)`: `TEVUC` changed to `APIPO`.
+    - `RNP S (AR)`: `ZORBA` changed to `AKDER`.
+
+### NZDN: Dunedin
+
+#### RWY 03
+
+- The following STARs have been amended: `MIPAK7A`, `MIPAK4C`
+    - Waypoint `ADBAD` changed to `IPMUL`.
+- The following STAR has been amended: `EPDAB4A`
+    - Waypoint `ALBOX` changed to `ISBIT`.
+
+#### RWY 21
+
+- The following STARs have been amended: `MIPAK5B`, `BASOS5B`
+    - Waypoint `ADBAD` changed to `IPMUL`.
+- The following STAR has been amended: `EPDAB4B`
+    - Waypoint `ALBOX` changed to `ISBIT`.
+- The following SID has been amended and renamed: `ISBIT1Q`
+    - Previously `ALBOX3Q`.
+    - Waypoint `ALBOX` changed to `ISBIT`.
+
+### NZHN: Hamilton
+
+#### RWY 18L
+
+- The following SID has been amended: `MUGIL2`
+    - Waypoint `SCARY` changed to `LEBIP`.
+
+#### RWY 36R
+
+- The following SID has been amended: `AGULA2`
+    - Waypoint `SCARY` changed to `LEBIP`.
+
+### NZNS: Nelson
+
+#### RWY 20
+
+- The following SIDs have been amended: `CONOR3Q`, `NESTA3Q`, `BISEB3Q`
+    - New altitude restriction at `POTIR`.
+
+### NZOH: Ohakea
+
+#### RWY 09
+
+- The following SID has been amended: `OH2`
+    - New SID applicable to runways 09, 15, 27, 33.
+
+#### RWY 15, 27, 33
+
+- The following SID has been disestablished: `OH1S`.
+
+### NZAP: Taupo
+
+#### RWY 35
+
+- The following RNP procedure has been amended: `RNP 35`
+    - Waypoint `MASKU` changed to `PEDVI`.
+
+### NZWN: Wellington
+
+#### RWY 34
+
+- The following ILS approach has been reinstated: `ILS 34`
+    - Procedure reinstated.
+
+## Standard Routes
+
+- `CHNS2` has been amended to `CHNS3`.
+- `HNAA3` has been amended to `HNAA1`.
+
+## Other Dataset Changes
+
+- `ARROW` has been renamed to `ENBIS`.
+- `MASKU` has been renamed to `PEDVI`.
+- `KINGS` has been renamed to `SUGEM`.
+- `ADBAD` has been renamed to `IPMUL`.
+- `ALBOX` has been renamed to `ISBIT`.
+- `BIGUL` has been renamed to `AGTAN`.
+- `STORK` has been renamed to `OLRIK`.
+- `TEVUC` has been renamed to `APIPO`.
+- `ZORBA` has been renamed to `AKDER`.
+- `SCARY` has been renamed to `LEBIP`.
+- `TOMAS` has been renamed to `BEMSA`.
diff --git a/docs/controller-skills/client-guides/vatSys-setup.md b/docs/controller-skills/client-guides/vatSys-setup.md
index ad75acfc..d1943266 100644
--- a/docs/controller-skills/client-guides/vatSys-setup.md
+++ b/docs/controller-skills/client-guides/vatSys-setup.md
@@ -11,9 +11,9 @@ Our vatSys dataset comes pre-loaded with everything a controller needs to get co
 
 ## Plugins
 
-Our vatSys dataset currently ships with two plugins, the VATNZ Standard Route Tool and the Multiple ATIS Editor.
+Our vatSys dataset currently ships with three plugins, the VATNZ Standard Route Tool, the Multiple ATIS Editor and the VATNZ Plugin for automatic sector extension. 
 
-Both Plugins can be downloaded from the [VATNZ Website](https://www.vatnz.net/vatnz/resources/)
+All the Plugins can be downloaded from the [VATNZ Website](https://www.vatnz.net/vatnz/resources/)
 
 ### VATNZ Standard Route Tool
 
diff --git a/docs/controller-skills/flight-service.md b/docs/controller-skills/flight-service.md
index a155ac58..4807f28e 100644
--- a/docs/controller-skills/flight-service.md
+++ b/docs/controller-skills/flight-service.md
@@ -11,10 +11,12 @@ title: Aerodrome Flight Information Service (AFIS)
 
 ## Positions
 
-| Position Name   | Shortcode | Callsign                                           | Frequency | Login ID   | Usage |
-| --------------- | --------- | ------------------------------------------------   | --------- | --------   | ----- |
-| Paraparaumu FIS | MFS       | Paraparaumu Flight Service   | 118.300   | NZPP_TWR   | Event Only |
-| Milford FIS     | PFS       | Milford Flight Service       | 118.200   | NZMF_TWR   | Event Only |
+| Position Name   | Shortcode | Callsign                   | Frequency | Login ID | Usage      |
+| --------------- | --------- | -------------------------- | --------- | -------- | ---------- |
+| Paraparaumu FIS | MFS       | Paraparaumu Flight Service | 118.300   | NZPP_TWR | Event Only |
+| Milford FIS     | PFS       | Milford Flight Service     | 118.200   | NZMF_TWR | Event Only |
+| Vava'u FIS      | VFS       | Vava'u Flight Service      | 118.100   | NFTV_TWR | Event only |
+| Niue FIS        | NFS       | Niue Flight Service        | 118.100   | NIUE_TWR | Event only |
 
 ## Overview
 
diff --git a/docs/oceanic/assets/nsfa-control.png b/docs/oceanic/assets/nsfa-control.png
deleted file mode 100644
index 0b3898fd..00000000
Binary files a/docs/oceanic/assets/nsfa-control.png and /dev/null differ
diff --git a/docs/oceanic/assets/raro-control.png b/docs/oceanic/assets/raro-control.png
deleted file mode 100644
index 8c8589ec..00000000
Binary files a/docs/oceanic/assets/raro-control.png and /dev/null differ
diff --git a/docs/pacific/assets/atah-approach.png b/docs/pacific/assets/atah-approach.png
new file mode 100644
index 00000000..b9b1f54d
Binary files /dev/null and b/docs/pacific/assets/atah-approach.png differ
diff --git a/docs/pacific/assets/ncrg-control.png b/docs/pacific/assets/ncrg-control.png
new file mode 100644
index 00000000..221f0dc4
Binary files /dev/null and b/docs/pacific/assets/ncrg-control.png differ
diff --git a/docs/pacific/assets/nftf-tower.png b/docs/pacific/assets/nftf-tower.png
new file mode 100644
index 00000000..b31e719c
Binary files /dev/null and b/docs/pacific/assets/nftf-tower.png differ
diff --git a/docs/pacific/assets/nsfa-control.png b/docs/pacific/assets/nsfa-control.png
new file mode 100644
index 00000000..295db70d
Binary files /dev/null and b/docs/pacific/assets/nsfa-control.png differ
diff --git a/docs/pacific/assets/nsfa-tower.png b/docs/pacific/assets/nsfa-tower.png
new file mode 100644
index 00000000..d4f81a12
Binary files /dev/null and b/docs/pacific/assets/nsfa-tower.png differ
diff --git a/docs/pacific/assets/nstu-tower.png b/docs/pacific/assets/nstu-tower.png
new file mode 100644
index 00000000..4158ab45
Binary files /dev/null and b/docs/pacific/assets/nstu-tower.png differ
diff --git a/docs/pacific/assets/ntaa-tower.png b/docs/pacific/assets/ntaa-tower.png
new file mode 100644
index 00000000..c6f8f60c
Binary files /dev/null and b/docs/pacific/assets/ntaa-tower.png differ
diff --git a/docs/pacific/assets/nttt-oceanic.png b/docs/pacific/assets/nttt-oceanic.png
new file mode 100644
index 00000000..9fac0533
Binary files /dev/null and b/docs/pacific/assets/nttt-oceanic.png differ
diff --git a/docs/pacific/assets/tah-control.png b/docs/pacific/assets/tah-control.png
new file mode 100644
index 00000000..47d108dc
Binary files /dev/null and b/docs/pacific/assets/tah-control.png differ
diff --git a/docs/pacific/assets/tnttb-tower.png b/docs/pacific/assets/tnttb-tower.png
new file mode 100644
index 00000000..ecdb9ea2
Binary files /dev/null and b/docs/pacific/assets/tnttb-tower.png differ
diff --git a/docs/pacific/assets/tnttm-tower.png b/docs/pacific/assets/tnttm-tower.png
new file mode 100644
index 00000000..85df4605
Binary files /dev/null and b/docs/pacific/assets/tnttm-tower.png differ
diff --git a/docs/pacific/assets/tnttr-tower.png b/docs/pacific/assets/tnttr-tower.png
new file mode 100644
index 00000000..dccd2c2b
Binary files /dev/null and b/docs/pacific/assets/tnttr-tower.png differ
diff --git a/docs/pacific/cookislands.md b/docs/pacific/cookislands.md
index bf2b5372..44b434a9 100644
--- a/docs/pacific/cookislands.md
+++ b/docs/pacific/cookislands.md
@@ -4,19 +4,26 @@
 
 --8<-- "includes/abbreviations.md"
 
-!!! info "This is a work in progress!"
-    This page is currently being worked on by the team. It'll be here soon! If you want to help out, [have a look how you can help](../contribute/index.md)! For the meantime, you should apply the comments made here in line with the skills taught in the VATNZ Controller Training Syllabus.
-    
-
-| Name               | Callsign                  | Frequency | Login    | Notes                       |
-| ------------------ | ------------------------- | --------- | -------- | --------------------------- |
-| Rarotonga Control  | Rarotonga (Raro) Control  | 118.900   | NCRG_CTR |                             |
-| Rarotonga Approach | Rarotonga (Raro) Tower    | 118.100   | NCRG_APP |                             |
-| Rarotonga Delivery | Rarotonga (Raro) Delivery | 121.900   | NCRG_DEL | For use during Events only. |
-
-<figure markdown> 
-  ![Rarotonga Enroute](../oceanic/assets/raro-control.png){ width="700" }
-  <figcaption>Right Click and open in a new tab to see full detail.</figcaption>
+| Position Name      | Shortcode | Callsign                  | Frequency | Login ID | Usage      |
+| ------------------ | --------- | ------------------------- | --------- | -------- | ---------- |
+| Auckland Radio     | ARO       | Auckland Radio            | 129.000   | NZZO_FSS | Primary    |
+| Rarotonga Control  | RAR       | Rarotonga (Raro) Control  | 118.900   | NCRG_CTR | Primary    |
+| Rarotonga Tower    | TRA       | Rarotonga (Raro) Tower    | 118.100   | NCRG_APP | Primary    |
+
+
+
+### Event Only Positions
+
+!!! Danger "Important"
+    The following are designated as Event Only positions, and may only be staffed during a VATNZ event where approved, or if explicitly authorised by the Operations Director.
+
+| Position Name      | Shortcode | Callsign                  | Frequency | Login ID | Usage      |
+| ------------------ | --------- | ------------------------- | --------- | -------- | ---------- |
+| Rarotonga Delivery | DRA       | Rarotonga (Raro) Delivery | 121.900   | NCRG_DEL | Event only |
+
+
+<figure markdown>
+  ![Rarotonga Enroute](../pacific/assets/ncrg-control.png)
 </figure>
 
 ## Enroute
@@ -24,7 +31,7 @@
 * **NCRG_CTR** "Rarotonga Control" on 118.900
     * **Limits**: 5,500ft to FL245, with the lateral bounds indicated as above. Roughly 340nm by 260nm.
     * Provides an Enroute radar service within its' lateral bounds.
-    * Additionally acts as the Enroute interface between NCRG_APP and either NTTT or NZZO FSS.
+    * Additionally acts as the Enroute interface between NCRG_APP and NZZO FSS.
     * Provides a top-down service to NCRG when NCRG_APP is offline.
 
 ## TMA
@@ -37,4 +44,4 @@
     *  Provides a combined Approach/Tower service for NCRG.
 
 !!! info "Wait, another Approach station with a Tower callsign?"
-    Similar to `NFTF_APP` above, we've had to implement this position with a `_APP` suffix, as the FSD restricts `_TWR` callsigns to a visibility range of 50nm. 
+    Similar to `NFTF_APP`, we've had to implement this position with a `_APP` suffix, as the FSD restricts `_TWR` callsigns to a visibility range of 50nm. 
diff --git a/docs/pacific/index.md b/docs/pacific/index.md
index e5d07066..a6c0c833 100644
--- a/docs/pacific/index.md
+++ b/docs/pacific/index.md
@@ -5,8 +5,3 @@
 --8<-- "includes/abbreviations.md"
 
 VATNZ has responsibility for not only the NZZC sector, but also the NZZO and NTTT FIRs. These FIRs cover a variety of areas - ranging from the tropical paradise of French Polynesia, to the bitter cold of Antarctica.
-
-!!! important
-    These pages are currently intended to provide basic position information in the interim, whilst the SOPs are being written.
-
-    In the meantime, you should control in-line with the VATNZ Controller Training Syllabus.
\ No newline at end of file
diff --git a/docs/pacific/samoa.md b/docs/pacific/samoa.md
index ae6dd1f9..475cc895 100644
--- a/docs/pacific/samoa.md
+++ b/docs/pacific/samoa.md
@@ -4,38 +4,69 @@
 
 --8<-- "includes/abbreviations.md"
 
-!!! info "This is a work in progress!"
-    This page is currently being worked on by the team. It'll be here soon! If you want to help out, [have a look how you can help](../contribute/index.md)! For the meantime, you should apply the comments made here in line with the skills taught in the VATNZ Controller Training Syllabus.
+| Position Name      | Shortcode | Callsign              | Frequency | Login ID | Usage   |
+| ------------------ | --------- | --------------------- | --------- | -------- | ------- |
+| Auckland Radio     | ARO       | Auckland Radio        | 129.000   | NZZO_FSS | Primary |
+| Faleolo Control    | FAL       | Faleolo Control       | 126.900   | NSFA_CTR | Primary |
+| Faleolo Tower      | TFA       | Faleolo Tower         | 118.100   | NSFA_TWR | Primary |
 
-| Name            | Callsign        | Frequency | Login    | Notes                       |
-| --------------- | --------------- | --------- | -------- | --------------------------- |
-| Faleolo Control | Faleolo Control | 126.900   | NSFA_CTR |                             |
-| Faleolo Tower   | Faleolo Tower   | 118.100   | NSFA_TWR |                             |
-| Pago Pago Tower | Pago Tower      | 122.900   | NSTU_TWR | For use during Events only. |
 
-## Enroute
+### Event Only Positions
 
-There are no real-world Enroute Sectors operating above Samoa, however due to Samoa's complex Approach sectors and large TMAs, we merge them into a single Faleolo Control Sector.
+!!! Danger "Important"
+    The following are designated as Event Only positions, and may only be staffed during a VATNZ event where approved, or if explicitly authorised by the Operations Director.
 
-<center>
-  ![NSFA Enroute](../oceanic/assets/nsfa-control.png){ width="700" }
-</center>
+| Position Name   | Shortcode | Callsign   | Frequency | Login ID | Usage      |
+| --------------- | --------- | ---------- | --------- | -------- | ---------- |
+| Pago Pago Tower | TTU       | Pago Tower | 122.900   | NSTU_TWR | Event only |
+
+## Faleolo Control
+
+There are no real-world Enroute Sectors operating above Samoa, however due to Samoa's complex Approach sectors and large TMAs, we haved merged them into a single Faleolo Control Sector.
+
+<figure markdown>
+  ![NSFA Enroute](../pacific/assets/nsfa-control.png)
+</figure>
 
 * **NSFA_CTR**: "Faleolo Control" on 126.900. 
     * **Limits**: Vertical limits differ. Includes the main sector to the West, and the 'R' sector over Pago Pago.
-        * The West Sector is from SFC to FL245. 
-        * The East Sector is from 3,500ft to FL245.
+        * The West Sector is from `SFC` to `FL245`. 
+        * The East Sector is from `A035` to `FL245`.
     * The West Sector provides an Enroute Service for NSFA, and interfaces directly with NSFA.
-    * The East Sector provides a TMA service to NSTU, but **does not** provide a Tower service, as the lower limit is 3,500ft. 
+    * The East Sector provides a TMA service to NSTU, but **does not** provide a Tower service, as the lower limit is `A035`. 
+
+## Faeleolo Tower
 
-## Tower
+<figure markdown>
+  ![NSFA Tower](../pacific/assets/nsfa-tower.png)
+</figure>
 
-* **NSFA_TWR** "Faleolo Tower" on 118.100
-    * **Limits**: SFC to 7,500ft. Lateral bounds as shown above.
+* **NSFA_TWR** "Faleolo Tower" on 118.100.
+    * **Limits**: `SFC` to `A075`. Lateral bounds as shown above.
     * Provides a Procedural Approach service for NSFA. Also provides a control service for NSMA to the west.
 
 ## Pago Pago (NSTU)
 
-NSTU (Pago Pago) is an interesting aerodrome. It is normally uncontrolled, with a combined App/Dep above it, starting at 3,500ft. On the network, this service is to be provided by NSFA_CTR. 
+<figure markdown>
+  ![NSTU Tower](../pacific/assets/nstu-tower.png)
+  <figcaption> In this case TTUs airspace is `SFC` to `A035` <figcaption>
+</figure>
+
+NSTU (Pago Pago) is an interesting aerodrome. It is normally uncontrolled, with a combined APP/DEP above it, starting at `A035`. On the network, this service is to be provided by FAL. 
+
+A tower position will be established on the network for NSTU, as an Event Only position on 122.900. While not incredibly accurate, it will be helpful when an event in underway in the area. The NSTU Clearance position will **not** be modelled.
+
+TTU shall request release of **ALL** IFR departures with FAL prior to departure. 
+
+Since there are no published SIDs TTU shall clear the aircraft by means of a radar vector or a means of establishing on track to thier first waypoint. 
+
+
+## Coordination
+
+As usual, any requests for a non-nominated approach shall be coordinated with the Towers as needed. 
+
+TTU shall request release of **ALL** IFR departures with FAL prior to departure.
+
+TFA may conduct auto-release to FAL provided the aircraft are on a RNAV SID off the Nominated Runway. 
 
-A tower position will be established on the network for NSTU, as an Event Only position on 122.900. While not incredibly accurate, it will be helpful when an event in underway in the area. The NSTU Clearance position will not be modelled.
\ No newline at end of file
+FAL shall provide a 10-minute warning to ARO before an aircraft crosses the common airspace boundary. As FAL provides a radar service no coordination is requried from ARO. 
\ No newline at end of file
diff --git a/docs/pacific/tahiti.md b/docs/pacific/tahiti.md
index 166c85dc..7c8a6f9d 100644
--- a/docs/pacific/tahiti.md
+++ b/docs/pacific/tahiti.md
@@ -4,19 +4,26 @@
 
 --8<-- "includes/abbreviations.md"
 
-!!! info "This is a work in progress!"
-    This page is currently being worked on by the team. It'll be here soon! If you want to help out, [have a look how you can help](../contribute/index.md)! For the meantime, you should apply the comments made here in line with the skills taught in the VATNZ Controller Training Syllabus.
+## Positions
 
+| Position Name   | Shortcode | Callsign        | Frequency | Login ID | Usage     |
+| --------------- | --------- | --------------- | --------- | -------- | --------- |
+| Tahiti Oceanic  | NTTT      | Tahiti Control  | 125.500   | NTTT_FSS | Primary   |
+| Tahiti Control  | TAH       | Tahiti Control  | 134.700   | NTTC_CTR | Primary   |
+| Tahiti Approach | A-TAH     | Tahiti Approach | 121.300   | NTAA_APP | Primary   |
+| Tahiti Tower    | T-TAH     | Tahiti Tower    | 118.100   | NTAA_TWR | Primary   |
+| Tahiti Ground   | G-TAH     | Tahiti Ground   | 121.900   | NTAA_GND | Secondary |
+| Bora Bora Tower | TNTTB     | Bora Tower      | 118.900   | NTTB_TWR | Primary   |
+| Raiatea Tower   | TNTTR     | Raiatea Tower   | 118.500   | NTTR_TWR | Primary   |
 
-| Name            | Callsign        | Frequency | Login    | Notes |
-| --------------- | --------------- | --------- | -------- | ----- |
-| Tahiti Control  | Tahiti Control  | 134.700   | NTTC_CTR |       |
-| Tahiti Approach | Tahiti Approach | 121.300   | NTAA_APP |       |
-| Tahiti Tower    | Tahiti Tower    | 118.100   | NTAA_TWR |       |
-| Moorea Tower    | Moorea Tower    | 118.100   | NTTM_TWR |       |
-| Bora Bora Tower | Bora Tower      | 118.900   | NTTB_TWR |       |
-| Raiatea Tower   | Raiatea Tower   | 118.500   | NTTR_TWR |       |
+### Event Only Positions
 
+!!! Danger "Important"
+    The following are designated as Event Only positions, and may only be staffed during a VATNZ event where approved, or if explicitly authorised by the Operations Director.
+
+| Position Name   | Shortcode | Callsign        | Frequency | Login ID | Usage      |
+| --------------- | --------- | --------------- | --------- | -------- | ---------- |
+| Moorea Tower    | TNTTM     | Moorea Tower    | 118.700   | NTTM_TWR | Event Only |
 
 ## Tahiti
 
@@ -71,30 +78,4 @@ The outer-most ring is the 200nm ring. Inside of this, the Class E service is pr
     * **TODO**: Investigate behaviour between NTTB and NTUU, as NTUU sits within NTTB's CTR.
 * **NTTR_TWR**: "Raiatea Tower" on 118.500
     * **Limits**:  SFC to 1,500ft. The Raiatea CTR is a weird bow-tie looking CTR, interfacing with Bora Bora's CTR to the NW, and extending out to the East by about 10nm. The top and bottom wedges are due to Fareura/Puurauti to the North, and Tefatoaiti to the South.
-
-### AFIS
-
-!!! warning "About Flight Information Services"
-    Flight Information Services provide a traffic advisory and weather information service. They also relay IFR clearances to aircraft on behalf of their senior sector. 
-
-    These stations **are not** a priority, and are simply "nice to have" positions that would be cool to feature in an event.
-
-
-* **NTAR_FIS**: "Rurutu Information" on 118.300
-* **NTAT_FIS**: "Tubuai Information" on 118.300
-* **NTAV_FIS**: "Raivavae Information" on 118.500
-* **NTGC_FIS**: "Tikehau Information" on 119.500
-* **NTGF_FIS**: "Fakarava Information" on 119.900
-* **NTGI_FIS**: "Manihi Information" on 124.300
-* **NTGJ_FIS**: "Totegegie Information" on 118.300
-* **NTGM_FIS**: "Makemo Information" on 121.400
-* **NTGT_FIS**: "Takapoto Information" on 118.500
-* **NTMD_FIS**: "Nukuhiva Information" on 118.300
-* **NTMN_FIS**: "Hiva Oa Information" on 119.700
-* **NTTG_FIS**: "Rangiroa Information" on 118.300
-* **NTTH_FIS**: "Huahine Information" on 119.300
-* **NTTO_FIS**: "Hao Information" on 119.100
-* **NTTP_FIS**: "Maupiti Information" on 118.300
-* **NTTR_FIS**: "Raiatea Information" on 118.500
-
-
+    
\ No newline at end of file
diff --git a/docs/pacific/tonga-niue.md b/docs/pacific/tonga-niue.md
index 7ab4327a..15794013 100644
--- a/docs/pacific/tonga-niue.md
+++ b/docs/pacific/tonga-niue.md
@@ -4,52 +4,76 @@
 
 --8<-- "includes/abbreviations.md"
 
-!!! info "This is a work in progress!"
-    This page is currently being worked on by the team. It'll be here soon! If you want to help out, [have a look how you can help](../contribute/index.md)! For the meantime, you should apply the comments made here in line with the skills taught in the VATNZ Controller Training Syllabus.
+| Position Name      | Shortcode | Callsign         | Frequency | Login ID | Usage     |
+| ------------------ | --------- | ---------------- | --------- | -------- | --------- |
+| Auckland Radio     | ARO       | Auckland Radio   | 129.000   | NZZO_FSS | Primary   |
+| Fua'amotu TWR      | TTF       | Fua'Amotu Tower  | 118.500   | NFTF_APP | Primary   |
+| Fua'amotu SMC      | GTF       | Fua'Amotu Ground | 121.900   | NFTF_GND | Secondary |
 
 
+### Event Only Positions
 
-| Name               | Callsign                  | Frequency | Login    | Notes                       |
-| ------------------ | ------------------------- | --------- | -------- | --------------------------- |
-| Rarotonga Control  | Rarotonga (Raro) Control  | 118.900   | NCRG_CTR |                             |
-| Rarotonga Approach | Rarotonga (Raro) Tower    | 118.100   | NCRG_APP |                             |
-| Rarotonga Delivery | Rarotonga (Raro) Delivery | 121.900   | NCRG_DEL | For use during Events only. |
+!!! Danger "Important"
+    The following are designated as Event Only positions, and may only be staffed during a VATNZ event where approved, or if explicitly authorised by the Operations Director.
 
-## TMA
+| Position Name | Shortcode | Callsign              | Frequency | Login ID | Usage      |
+| ------------- | --------- | --------------------- | --------- | -------- | ---------- |
+| Vava'u FIS    | VFS       | Vava'u Flight Service | 118.100   | NFTV_TWR | Event only |
+| Niue FIS      | NFS       | Niue Flight Service   | 118.100   | NIUE_TWR | Event only |
 
-* **NFTF_APP** "Fua'Amotu Tower" on 118.500
-    * **Limits**: There are three layers to NFTF_APP's area of responsibility:
-        * A circle 23nm in diameter, centered on TBU VOR from SFC to 3,500ft.
-        * A circle 75nm in diameter, centered on TBU VOR from 3,500ft to 9,500ft.
-        * A circle 100nm in diameter, centered on TBH VOR from 9,500ft to 19,500ft.
-    * Fua'Amotu would hand aircraft off to NZZO_FSS upon crossing the boundary.
+
+## Fua'amotu Tower
 
 !!! info "Why is their callsign Tower, not Approach?"
     We've had to implement this position with a `_APP` suffix, as the FSD restricts `_TWR` callsigns to a visibility range of 50nm. 
 
-## Towers
+**NFTF_APP** "Fua'Amotu Tower" on 118.500
+
+### Airspace
+
+<figure markdown>
+  ![NFTF Tower](../pacific/assets/nftf-tower.png)
+</figure>
+
+**Limits**: There are three layers to NFTF_APP's area of responsibility:
+
+- A circle 23nm in diameter, centered on TBU VOR from SFC to 3,500ft.
+
+- A circle 75nm in diameter, centered on TBU VOR from 3,500ft to 9,500ft.
+
+- A circle 100nm in diameter, centered on TBH VOR from 9,500ft to 19,500ft.
+
+Fua'Amotu TWR shall instruct aircraft to report passing `FL190` additionally should aircraft be climbing above `FL245` they shall be instructed to contact ARO passing `FL240`. Ie. "Passing `FL240` contact Auckland Radio 129.0"
+
+
+## AFIS NFTV/NIUE
+
+!!! warning "AFIS"
+    NFTV AFIS is not yet modelled on the network however we endever to get this set up within the near future 
+
+Vava'u and Niue have a Flight Information Service, while only Vava'u weirdly has a Ground service on 121.900. The FIS provides only traffic information. This will be modelled as **NFTV_TWR** or **NIUE_TWR**, with a standard Tower visibility range of 50nm. The Tower is to provide a traffic information service, in addition to relaying IFR clearances from NZZO_FSS.
+
+Clearances remain **invalid** until Auckland Radio advises that they are released. Controllers shall note aircraft cruising below `FL245` shall be advised they will only get a traffic service
+
+
+Refer to the **AFIS** [guide](../../controller-skills/flight-service.md#standard-phraseology).
+
 
-None! NFTF_TWR is covered by NFTF_APP.
+### Departures
 
-## AFIS
 
-* **NFTL_FIS**: "Lifuka Radio" on 118.100.
-* **NFTV_FIS**: "Vava'u Flight Service" on 118.100
-    * This aerodrome weirdly has a Ground service on 121.900, but only an AFIS over top.
+Both Flight Services shall instruct aircraft that are vacating the MBZ to contact ARO. If aircraft are unable to make contact with ARO they shall remain on the AFIS frequency until they are able to make contact with ARO. 
 
-!!! warning
-    These are not yet modelled on the network.
 
-## Niue
 
-Niue only has a Flight Information Service, providing only traffic information. This will be modelled as **NIUE_TWR**, with a standard Tower visibility range of 50nm. The Tower is to provide a traffic information service, in addition to relaying IFR clearances from NZZO_FSS.
+### Arrivals
 
-**Departing** 
+Arriving aircraft will be given clearance to leave Controlled Airspace on descent through `FL245`. Aircraft should attempt to make contact with NFS around 40 DME. If aircraft are unable to make contact with NFS, they should call ARO, who should call Nuie on the landline to attempt to make contact. NFS will report your landing back to NZZO_FSS in order to close your flightplan.
 
-Departing aircraft should make contact with NZZO_FSS upon passing 20DME from `NU`. If unable to gain contact, they are to remain with NIUE_TWR until they have positive contact.
- 
-**Arriving** 
+## Coordination
 
-Arriving aircraft will be given clearance to leave Controlled Airspace on descent through FL245, however should maintain a listening watch on NZZO_FSS. Aircraft should attempt to make contact with NIUE_TWR around 40 DME, and shall report that positive contact to NZZO_FSS before dropping that frequency. NIUE_TWR will report your landing back to NZZO_FSS in order to close your flightplan.
+As usual, any requests for a non-nominated approach shall be coordinated with the Tower as needed. In the unlikely case.  
 
+TTF shall provide a 10-minute warning to ARO before an aircraft crosses the common airspace boundary. ARO shall provide the same warning to TTF for arriving aircraft. 
 
+Flight Services shall call ARO to cancel Flight Plans for arriving aircraft. 
\ No newline at end of file
diff --git a/includes/abbreviations.md b/includes/abbreviations.md
index c0b1eba1..dfe94515 100644
--- a/includes/abbreviations.md
+++ b/includes/abbreviations.md
@@ -51,4 +51,5 @@
 *[RTF]: Radio Telephony
 *[DMAPS]: Divergent Missed Approach Procedures System
 *[WDTMA]: Williams Terminal Area (Williams Tower)
+*[FSD]: Flight Simulator Daemon (Main connection between Pilots and Controllers)
 <!-- ADD Aerodrome Codes -->