Added more of the stuff Kevin added to his branch