Start adding grouping, removing global state