Refactored activity_snippets

Needs to play nice with @virginiacc's PR though, so we should wait until her PR is merged before merging this.