Feature/draft classifications

Fixed with commit cc005bd