Unborked a lot of connectioncode