Refactor code.  Implement plugin.