Since roughly the turn of the millenium, next-to-leading order calculations and resummation in the form of parton showers have been largely automated and process-independent, through an impressive effort by theorists and event generator developers. In this talk I will outline the ideas behind NLO matching to parton showers and describe the extension of the method to QED. I will present results from a leading-order parton shower and a NLO-matched parton shower and compare these to the established YFS approach.Since roughly the turn of the millenium, next-to-leading order calculations and resummation in the form of parton showers have been largely automated and process-independent, through an impressive effort by theorists and event generator developers. In this talk I will outline the ideas behind NLO matching to parton showers and describe the extension of the method to QED. I will present results from a leading-order parton shower and a NLO-matched parton shower and compare these to the established YFS approach.