Add click binding
Use single brackets for tokens
Lots of refactoring