WIP: Quoting patch

Not sure this is the right approach. Would appreciate some feedback.