code compiling on Windows now, one TODO remaining