Fixed 1/2 of homework 17 :D