Now completely using SDL2