Updated to window class, now working to minimum expected level