The National Aeronautics and Space Administration (NASA) is conducting research to improve airport capacity by reducing the separation distance between aircraft. The limiting factor in reducing separation distances and improving airport capacity is the wake vortex hazard. The ability to accurately model wake vortices and predict the outcome of a vortex encounter is critical in developing a system to safely improve airport capacity. This is the focus of the wake vortex research being done at NASA Langley Research Center (LaRC). This paper will concentrate on two topics. The first topic is the control system developed for the Boeing 737 freeflight model in support of vortex encounter tests to be conducted in the 30- by 60- foot tunnel at NASA Langley Research Center later this year. The second topic discussed is the limited degree of freedom (DOF) trajectory generation study that is being conducted to determine the relative severity of a multitude of paths through a wake vortex