More work on dinner plugin