first commit of Phase 2 CaloTowers (does not quite compile yet)