More week-2 problem re-dos, almost done.