Wizard Update

Added the Wizard class, and some minor other updates.