Done with problem 1, final