homework-4 (second commit)

Not fully working version