diff --git a/2019/README.md b/2019/README.md
index 934993a..b249e80 100644
--- a/2019/README.md
+++ b/2019/README.md
@@ -1,11 +1,34 @@
-# BDPA National HSCC 2019 Problem Statement
+# BDPA NHSCC 2019 Problem Statements
-This was not the problem statement issued during the 2019 competition, but it is
-very similar. It has been retrofitted to conform with the new competition format
-and is suitable for teams to train with for future competitions.
+This was not the problem statement released during the 2019 competition, but it
+is very similar. The original 2019 problem statement was extended to conform
+with the new competition format and is okay to use as training material.
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2019.solutions.hscc.bdpa.org).
+## Key Challenges
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/elections.api.hscc.bdpa.org).
+This year's problem statements were designed with the following challenges in
+mind:
+
+- Interacting with unreliable sometimes-unavailable external data sources
+- Implementing or tweaking a non-trivial algorithm
+- Implementing an authentication mechanism, i.e. login and registration
+- [Responsive UX](https://en.wikipedia.org/wiki/Responsive_web_design), i.e. the
+ app is functional on mobile, tablet, and desktop screens
+- Observing basic application, database, and repository security best practices
+
+## Statements
+
+There was no sample problem statement released this year.
+
+
+
+### [**BDPA Elections**](/2019/elections)
+
+📑 [Problem statement](/2019/elections)
+🌍 [Live demo](https://elections.solutions.hscc.bdpa.org)
+📚 [Interactive API docs](https://hscc4cfe8be7.docs.apiary.io/)
+\-\-\-\-
+📦 [Demo source code](https://github.com/nhscc/elections.solutions.hscc.bdpa.org)
+🎒 [API source code](https://github.com/nhscc/elections.api.hscc.bdpa.org)
+
+
diff --git a/2019/bdpa-elections-part-1.md b/2019/elections/bdpa-elections-part-1.md
similarity index 100%
rename from 2019/bdpa-elections-part-1.md
rename to 2019/elections/bdpa-elections-part-1.md
diff --git a/2019/bdpa-elections-part-2.md b/2019/elections/bdpa-elections-part-2.md
similarity index 100%
rename from 2019/bdpa-elections-part-2.md
rename to 2019/elections/bdpa-elections-part-2.md
diff --git a/2020/README.md b/2020/README.md
index 058de41..bd87571 100644
--- a/2020/README.md
+++ b/2020/README.md
@@ -1,10 +1,43 @@
-# BDPA National HSCC 2020 Problem Statement
+# BDPA NHSCC 2020 Problem Statements
-This is the problem statement issued during the 2020 competition and is suitable
-for teams to train with for future competitions.
+The original 2019 problem statement was [**re-imagined**](/2019/elections) as
+the sample statement for 2020. [**BDPA Airports**](/2020/airports) is the actual
+problem statement for 2020.
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2020.solutions.hscc.bdpa.org).
+## Key Challenges
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/airports.api.hscc.bdpa.org).
+This year's problem statements were designed with the following challenges in
+mind:
+
+- Reading dynamically from sometimes-unavailable external data sources
+- Storing, sorting, caching, and filtering large amounts of rapidly evolving
+ data
+- Implementing flexible authentication, i.e. optional login and registration
+- [Responsive UX](https://en.wikipedia.org/wiki/Responsive_web_design), i.e. the
+ app is functional on mobile, tablet, and desktop screens
+- Observing basic application, database, and repository security best practices
+
+## Statements
+
+
+
+### [**BDPA Elections**](/2019/elections)
+
+📑 [Problem statement](/2019/elections)
+🌍 [Live demo](https://elections.solutions.hscc.bdpa.org)
+📚 [Interactive API docs](https://hscc4cfe8be7.docs.apiary.io/)
+\-\-\-\-
+📦 [Demo source code](https://github.com/nhscc/elections.solutions.hscc.bdpa.org)
+🎒 [API source code](https://github.com/nhscc/elections.api.hscc.bdpa.org)
+
+### [**BDPA Airports**](/2020/airports)
+
+📑 [Problem statement](/2020/airports)
+🌍 [Live demo](https://airports.solutions.hscc.bdpa.org)
+📚 [Interactive API docs](https://hsccdfbb7244.docs.apiary.io/) (version 1)
+📚 [Interactive API docs](https://hscc210ff8c0.docs.apiary.io/) (version 2)
+\-\-\-\-
+📦 [Demo source code](https://github.com/nhscc/airports.solutions.hscc.bdpa.org)
+🎒 [API source code](https://github.com/nhscc/airports.api.hscc.bdpa.org)
+
+
diff --git a/2020/bdpa-airports-part-1.md b/2020/airports/bdpa-airports-part-1.md
similarity index 100%
rename from 2020/bdpa-airports-part-1.md
rename to 2020/airports/bdpa-airports-part-1.md
diff --git a/2020/bdpa-airports-part-2.md b/2020/airports/bdpa-airports-part-2.md
similarity index 100%
rename from 2020/bdpa-airports-part-2.md
rename to 2020/airports/bdpa-airports-part-2.md
diff --git a/2020/elections b/2020/elections
new file mode 120000
index 0000000..9b73986
--- /dev/null
+++ b/2020/elections
@@ -0,0 +1 @@
+../2019/elections
\ No newline at end of file
diff --git a/2021/README.md b/2021/README.md
index 193d717..e19cbf5 100644
--- a/2021/README.md
+++ b/2021/README.md
@@ -1,10 +1,3 @@
-# BDPA National HSCC 2021 Problem Statement
+# BDPA NHSCC 2021 Problem Statements
-This is the problem statement issued during the 2021 competition and is suitable
-for teams to train with for future competitions.
-
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2021.solutions.hscc.bdpa.org).
-
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/X.api.hscc.bdpa.org).
+_TBA_
diff --git a/2022/README.md b/2022/README.md
index 2305893..7663a88 100644
--- a/2022/README.md
+++ b/2022/README.md
@@ -1,10 +1,3 @@
-# BDPA National HSCC 2022 Problem Statement
+# BDPA NHSCC 2022 Problem Statements
-This is the problem statement issued during the 2022 competition and is suitable
-for teams to train with for future competitions.
-
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2022.solutions.hscc.bdpa.org).
-
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/X.api.hscc.bdpa.org).
+_TBA_
diff --git a/2023/README.md b/2023/README.md
index eef82eb..8744474 100644
--- a/2023/README.md
+++ b/2023/README.md
@@ -1,10 +1,3 @@
-# BDPA National HSCC 2023 Problem Statement
+# BDPA NHSCC 2023 Problem Statements
-This is the problem statement issued during the 2023 competition and is suitable
-for teams to train with for future competitions.
-
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2023.solutions.hscc.bdpa.org).
-
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/X.api.hscc.bdpa.org).
+_TBA_
diff --git a/2024/README.md b/2024/README.md
index dd91677..a9dc84b 100644
--- a/2024/README.md
+++ b/2024/README.md
@@ -1,10 +1,3 @@
-# BDPA National HSCC 2024 Problem Statement
+# BDPA NHSCC 2024 Problem Statements
-This is the problem statement issued during the 2024 competition and is suitable
-for teams to train with for future competitions.
-
-The demo implementation of this solution can be found
-[here](https://github.com/nhscc/2024.solutions.hscc.bdpa.org).
-
-The API implementation used for this problem statement can be found
-[here](https://github.com/nhscc/X.api.hscc.bdpa.org).
+_TBA_
diff --git a/2025/README.md b/2025/README.md
new file mode 100644
index 0000000..6f70ce7
--- /dev/null
+++ b/2025/README.md
@@ -0,0 +1,3 @@
+# BDPA NHSCC 2025 Problem Statements
+
+_TBA_
diff --git a/2026/README.md b/2026/README.md
new file mode 100644
index 0000000..c37f683
--- /dev/null
+++ b/2026/README.md
@@ -0,0 +1,3 @@
+# BDPA NHSCC 2026 Problem Statements
+
+_TBA_
diff --git a/README.md b/README.md
index 2922109..27cdf20 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,55 @@
-# problem-statements
-Past NHSCC problem statements and related resources.
+# BDPA NHSCC Problem Statement Archive
+
+Welcome! This is a collection of past and present NHSCC problem statements and
+related resources.
+
+Each problem statement is broken up into two parts: the primary _Problem
+Statement 1_ (PS1), which is released **at least a month before the conference**
+and must be completed within that time frame, and the supplementary _Problem
+Statement 2_ (PS2), which is released **during the conference** and must be
+completed within 8 hours.
+
+Two problem statements are released every year: a _sample_ and an _actual_
+problem statement. Each problem statement pair presents students with a similar
+challenge, so if a team can complete the sample PS1 and PS2, they are in an
+excellent position to do well on the actual competition problem statement.
+
+## This Year's Problem Statements
+
+
+
+Sample: _- TBA -_
Actual: _- TBA -_
+
+## Past Problem Statements
+
+Past problem statements and their APIs will remain functional
+_forever_1, and can be used as training material for future
+competitions.
+
+1 Unless
+[GitHub Actions](https://github.com/features/actions),
+[MongoDB Atlas](https://www.mongodb.com/cloud/atlas), or
+[Vercel](https://vercel.com/) go down
+
+
+
+### [**BDPA Elections**](/2019/elections)
+
+📑 [Problem statement](/2019/elections)
+🌍 [Live demo](https://elections.solutions.hscc.bdpa.org) (currently offline)
+📚 [Interactive API docs](https://hscc4cfe8be7.docs.apiary.io/)
+\-\-\-\-
+📦 [Demo source code](https://github.com/nhscc/elections.solutions.hscc.bdpa.org)
+🎒 [API source code](https://github.com/nhscc/elections.api.hscc.bdpa.org)
+
+### [**BDPA Airports**](/2020/airports)
+
+📑 [Problem statement](/2020/airports)
+🌍 [Live demo](https://airports.solutions.hscc.bdpa.org) (currently offline)
+📚 [Interactive API docs](https://hsccdfbb7244.docs.apiary.io/) (version 1)
+📚 [Interactive API docs](https://hscc210ff8c0.docs.apiary.io/) (version 2)
+\-\-\-\-
+📦 [Demo source code](https://github.com/nhscc/airports.solutions.hscc.bdpa.org)
+🎒 [API source code](https://github.com/nhscc/airports.api.hscc.bdpa.org)
+
+