Discourse

So this is the MVP for working discourse. Let's get it in to master.