Made each window a separate class - much tidier.