Moving to SDL 2.0 (Working in progress)