WIP: make broken tests pass, yeah