Further work on initial version of plugin