solved final tasks (4 and 5), thus this should be the final commit