Updated the classes to my most recent versions.

Updated to VS2012