Partial commit for SDL