Completed HW6

Completed HW6 - without Optional problem