Issue 12 - Un/FINISHED - 2025-6