going to have to remove the need to pass the connection all over the place