WIP - trying to figure out why tests are failing.