Quill and Quire

Address changes