ADDQ appears to be finished.
Merged my work with J.W.'s.