Finished the worklist modification. Testing required.