More refactor, and adding WCCAerials info