Working on proper class manging.