Commit before more work on quoting system.  Use this commit to revert to old quote system