Patch 2018-2023

Draft.