Initial transition to SDL 2