Keep track of number->groups, add TODO to refresh, other tweaks