re-Worked how a fair bit of the core part of this plugin works.