add addquote and some todos