added name and problem 2 stuff