Working on the base of the plugin some more.