Prep for VS 2015 and a huge refactor