Beginning conversion to SDL 2.0