Changed connection a little. TODO: WE SHOULD DO THIS: Test that it actually can be used to connect still, :D