Moved some code and updating documentation
Adding some testing for the plugin
Adding keywords