Using separate classes now.