Made the window wrapper a *little* bit better, still have more work to do on it.