More work in the re-write of the dialoghandler.