A system includes a battery module having a heat sink outer wall feature and a plurality of battery cells. The battery module also includes a plurality of internal heat fins interleaved with the plurality of battery cells, wherein each of the plurality of internal heat fins is in thermal communication with at least one of the plurality of battery cells and in thermal communication with the heat sink outer wall feature. The battery module further includes a plurality of phase change material (PCM) layers interleaved with the plurality of battery cells, wherein each of the plurality of PCM layers is configured to be in thermal communication with at least one of the plurality of battery cells and in thermal communication with at least one of the plurality of internal heat fins.