Updates

Connection doesn't compile - in middle of cahnges