Working on getting Win64 version working