Add onClick support
Add intent EXTRA
Experimental click/long click support