Updates

Kinda strange to have something be both a nested col group and a column, but we can roll with it for now.