Rewrite with vs2015. This works now.
Remove old code and comments