big reorg; lots of auth work