Finished Question 4
-fixed issues