Another go
Maybe finished this part
Finally
Tests pass
Completed