Laying the groundwork for Win8 support