Looks like this is always passed a window, is this needed?