ENH: move more stuff over and get vs 9 working
5 files changed