First pass at a VS2012 compile