Reworking clicking to be more extensible
Reworking clicking to be more extensible