Finish Quill2, make everything safe there