#26

Adding first draft of incorporating Roman Nurik's wizard model.  Next step: integrate instead of just adding a bunch of unused files.