Some progress, still needs work.