Changes compiled for Derrick, adding my changes to main project.

I added Don's ifdef windows stuff to my updated controller