Move to vs 2012
Add some more code
Get rid of null-checks
Get all parsing artifacts working