Updates to include being able to build within visual studio 2012