First real working version of classifier