Propert click handling!
Progress