I've started reviewing the changes so far and will get back to you when I have some feedback or other points! It's looking great so far, so I think it will be only minor points.

Anyway, let me know when the click implementation is at a "ready-ish" stage and I will do some testing of functionality/usability compared to the previous implementation.

Also, don't worry about merging this pull request with any newer changes on master. I will handle those at a later point.

Again, thanks for your very large contribution!