moved more functions off to auth and aggregator