Recent advances in phylogeny reconstruction and floral genetics set the stage for new investigations of the origin and diversification of the flower. We review the current state of angiosperm phylogeny, with an emphasis on basal lineages. With the surprising inclusion of Hydatellaceae with Nymphaeales, recent studies support the topology of Amborella sister to all other extant angiosperms, with Nymphaeales and then Austrobaileyales as subsequent sisters to all remaining angiosperms. Notable modifications from most recent analyses are the sister relationships of Chloranthaceae with the magnoliids and of Ceratophyllaceae with eudicots. We review "trends" in floral morphology and contrast historical, intuitive interpretations with explicit character-state reconstructions using molecular-based trees, focusing on (1) the size, number, and organization of floral organs; (2) the evolution of the perianth; (3) floral symmetry; and (4) floral synorganization. We provide summaries of those genes known to affect floral features that contribute to much of floral diversity. Although most floral genes have not been investigated outside of a few model systems, sufficient information is emerging to identify candidate genes for testing specific hypotheses in nonmodel plants. We conclude with a set of evo-devo case studies in which floral genetics have been linked to variation in floral morphology.