Rewrite quill, changed API a bit.