Finish implementing quotes feature