Quotes table stuff - pre Kal's pull request