Midway progress in updating styles a lot. Cleaned up some of the group_by code with good success too.