Implement lazy connect menu alternative

I still need to clean all this up later...