Switched to SDL and some clean up