Add problem 7 and cleanup 6