Upgraded to VS 2012 solution