Moved Window specific code to Window.go