Started adding click handlers