merging skyler's stuff