I think this is working now, at least on a machine but I have yet to run on a clean box from scratch