The wizard code *almost* works now!