Feature/sdl2

Stable enough to be merged. Request for review.