Not quite done, but getting there.