Genericize problems and add Problem 6