First attempt at 25.
This doesn't have to be mutable.
Removed unused import.