towards Win64

Working towards #609
Still trying to get the unittests running.