working again
2nd task
second with tests