Implement refactored tool
Merge pull request #1 from glowdigitalmedia/implement_refactored_tool

Implement refactored tool