Evolution is the unifying theory of biology. The importance of understanding evolution by those who study the origins, diversification and diversity life cannot be overstated. Because of its importance, in addition to a scientific study of evolution, many researchers have spent time studying the acceptance and the teaching of evolution. Phylogenetic Systematics is the field of study developed to understand the evolutionary history of organisms, traits, and genes. Tree-thinking is the term by which we identify concepts related to the evolutionary history of organisms. It is vital that those who undertake a study of biology be able to understand and interpret what information these phylogenies are meant to convey. In this project, we evaluated the current impact a traditional study of biology has on the misconceptions students hold by assessing tree-thinking in freshman biology students to those nearing the end of their studies. We found that the impact of studying biology was varied with some misconceptions changing significantly while others persisted. Despite the importance of tree-thinking no appropriately developed concept inventory exists to measure student understanding of these important concepts. We developed a concept inventory capable of filling this important need and provide evidence to support its use among undergraduate students. Finally, we developed and modified activities as well as courses based on best practices to improve teaching and learning of tree-thinking and organismal diversity. We accomplished this by focusing on two key questions. First, how do we best introduce students to tree-thinking and second does tree-thinking as a course theme enhance student understanding of not only tree-thinking but also organismal diversity. We found important evidence suggesting that introducing students to tree-thinking via building evolutionary trees was less successful than introducing the concept via tree interpretation and may have in fact introduced or strengthened a misconception. We also found evidence that infusing tree-thinking into an organismal diversity course not only enhances student understanding of tree-thinking but also helps them better learn organismal diversity.