Added some click TODO