Simplify and cleverify clickCount mechanism.  Add addFunc method.