Slowly shiffting to single-window and refactoring along the way