Refactoring the way windows are requested/managed/and state persisted.