More work on Quill UG.