Port initialisation changes to SDL2
Getting closer