Started on dialog

More templating