Refactorings, and finished incremental deck options. Made prefs be stored in model.