Minor connect change

Just rearranged some of the connect and new link code to something that
made more sense and may allow proper connect :P