Adding click support. untested as of lack of 0.8.