Now with passing tests.