Added group example data and applied it to the account template
pulled from origin and fixed conflicts