Refactoring.  Started on click handling.