Working on refactoring logic out into other plugins and other classes