Some progress, but needs more work