Created by: efritz
Conflicted by adding new uses of function that changed signature.
Unit tests will now run 😛