Permanent geological carbon storage will reduce greenhouse gas emissions and help mitigate climate change. Storage security is increased by CO2 capillary trapping in cm-to-m scale, layered rock heterogeneities; features that are ubiquitous across storage sites worldwide. This talk will outline the challenges associated with modelling the impact of small-scale heterogeneity on large scale saturation distributions and trapping during geological CO2 storage, including the difficulties in incorporating petrophysical and geological uncertainty into field-scale numerical models. Experimental results demonstrate the impact of cm-scale heterogeneity on pore-scale processes, which in turn influence large scale behaviour. Heterogeneity is shown to have a leading order impact on saturation distribution and storage capacity during geological CO2 storage.