Changed Window a bit, starting on more support for DisplayMethods