Added groups call with header population, some cleanup