More work on initial plugin from tutorial