Started adding dialogue code
fixed merge conflicts