Preparing to make win64 combatible, still broken