Making some progress with the discourse side of things, but we're not there yet..