Adding Windows code back in.  Not working yet.