This document summarizes a master's dissertation that investigates the use of wavy leading edges on flaps to improve performance against upstream trailing vortices. Computational fluid dynamics simulations were performed using URANS turbulence models to test a two-element airfoil with wavy versus straight leading edge flaps. Initial studies optimized the relative position of the airfoil elements. Additional simulations then evaluated wavy flaps with varying amplitudes and wavelengths under clean and vortex conditions. Results showed wavy flaps performed worse than straight flaps without vortices but were more robust in the presence of upstream vortices.