Start of intercepting clicks, still a few hacks to remove