Worked on issue #33: Finished upgrade on tool average.
TODO: Integrate with overlay tool.