Made tool respond using listeners
Moved static methods.