Adding groups to this branch, also tidying up the shop stuff for Laura