cleaner code
fix
basic click handling
abc