Got all current tests passing.