Refactor / start SDL again