Refactored to use new model for UI, all writing code commented; wizard package temporarily excluded.