refactored, now it's not a plugin.

closing branch.