Fix selectors and ensure there are no name clashes
Add console logging