Home Task #3

Implemented, but have some issues