Cleaned up grouping code now that Observations are singletons