start writting tests
merged
try the other way
it's ready