Dialogue stuff!
Merge branch 'dialog'