A lot more work, but still some issues.