Should pass tests, finally.