Sixth project iteration

Sixth project iteration with bonus assingment