re did the connectivity part, and initial marshall