Upgraded to VS2013 Solution