Convection is the transport of energy by bulk mass motions. Magnetic fields alter convection via the Lorentz force, while convection moves the fields via the curl( v × B ) term in the induction equation. Recent ground-based and satellite telescopes have increased our knowledge of the solar magnetic fields on a wide range of spatial and temporal scales. Magneto-convection modelling has also greatly improved recently as computers become more powerful. Three-dimensional simulations with radiative transfer and non-ideal equations of state are being performed. Flux emergence from the convection zone through the visible surface (and into the chromosphere and corona) has been modelled. Local, convectively driven dynamo action has been studied. The alteration in the appearance of granules and the formation of pores and sunspots has been investigated. Magneto-convection calculations have improved our ability to interpret solar observations, especially the inversion of Stokes spectra to obtain the magnetic field and the use of helioseismology to determine the subsurface structure of the Sun.