Problem 2 has been finished. I commented out the first problem to test.