Considered moving this into a group service?