Started work on WindowHandler