Reverted to 5988f77 and reworked Window to use GraphicsEnvoirnment