cudno
refactor, sad ne radi + unittests