Reorg and Get Command Center working