merge group stuff by tom into the item branch