Aren is smart

Aren’s changes made sense, especially how the zero case was handled.
Tidied up so it builds now.