Prepping migration to SDL2 and integration of other code