Add in more problem 3 stuff