Cleanup, rework week 4, and week 5.