Added Window class, Regression :ESC no longer exits