Adding draw class (for now)