Upgrading to VS2013... unfinished