Start rewriting old classes