Moved debug to classes