Refactored mutli site task tool to be more portable