Added sharing and connection stuff as well.