Added second option to seperate the two functions of this plugin.

TODO: Alot of cleanup.