Working wersion, needs some polishing. Added 1 test data file