Started adding SDL2 support